mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-28 23:15:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

tbox/camera/d_bg_w_kcol work and cleanup (#2262)

Browse Source 
* some camera/tbox cleanup

* d_bg_w_kcol work

* make item name enum better
This commit is contained in:
TakaRikka
2024-12-10 08:46:19 -08:00
committed by GitHub
parent 3fa6b50e6a
commit 8d73439554
100 changed files with 4161 additions and 3958 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h
+5
View File
@@ -3,6 +3,11 @@
namespace std {
template<typename T>
inline double fabs(T x) {
return ::fabs(x);
}
inline float fabs(float num) {
return ::fabsf(num);
}
src/d/actor/d_a_alink.cpp
+139 -139
View File
@@ -61,7 +61,7 @@ u8 struct_80450FBC[4];
static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data);
/* 8009D87C-8009D884 0981BC 0008+00 0/0 1/1 0/0 .text getE3Zhint__9daAlink_cFv */
bool daAlink_c::getE3Zhint() {
BOOL daAlink_c::getE3Zhint() {
return false;
}
@@ -133,7 +133,7 @@ bool daAlink_c::checkWindSpeedOnXZ() const {
return field_0x35b8.abs2XZ() > 1.0f;
}
bool daPy_py_c::i_checkShieldGet() const {
return dComIfGs_getSelectEquipShield() != NO_ITEM;
return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE;
}
u32 daPy_py_c::getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
@@ -1267,7 +1267,7 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) {
}
}
}
} else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == FAIRY) {
} else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == fpcNm_ITEM_FAIRY) {
var_r29 = field_0x285c.getActor();
} else if (mProcID == PROC_FISHING_CAST || mProcID == PROC_CANOE_FISHING_WAIT || mProcID == PROC_CANOE_FISHING_REEL || mProcID == PROC_CANOE_FISHING_GET) {
var_r29 = mItemAcKeep.getActor();
@@ -5510,15 +5510,15 @@ static int daAlink_createHeap(fopAc_ac_c* i_this) {
}
bool daPy_py_c::checkWoodSwordEquip() {
return dComIfGs_getSelectEquipSword() == WOOD_STICK;
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK;
}
bool daPy_py_c::checkLightMasterSwordEquip() {
return dComIfGs_getSelectEquipSword() == LIGHT_SWORD;
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD;
}
BOOL daPy_py_c::i_checkSwordGet() {
return dComIfGs_getSelectEquipSword() != NO_ITEM;
return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE;
}
/* 800A4910-800A4BC8 09F250 02B8+00 5/5 0/0 0/0 .text setSelectEquipItem__9daAlink_cFi */
@@ -5558,12 +5558,12 @@ void daAlink_c::setSelectEquipItem(int param_0) {
}
if (checkWoodSwordEquip()) {
if (mEquipItem == EQUIP_SWORD || param_0 != 0) {
if (mEquipItem == 0x103 || param_0 != 0) {
mSwordModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide();
} else {
mSwordModel->getModelData()->getMaterialNodePointer(1)->getShape()->show();
}
} else if (mEquipItem == EQUIP_SWORD || param_0 != 0) {
} else if (mEquipItem == 0x103 || param_0 != 0) {
mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->show();
} else {
mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide();
@@ -5615,8 +5615,8 @@ u32 daPy_py_c::i_getLastSceneMode() {
void daAlink_c::playerInit() {
mHeavySpeedMultiplier = 1.0f;
if (!checkDungeon() && !checkBossRoom() && checkItemGet(DUNGEON_EXIT, 1)) {
dComIfGs_setItem(SLOT_18, TKS_LETTER);
if (!checkDungeon() && !checkBossRoom() && checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) {
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_TKS_LETTER);
}
u16 i;
@@ -5740,7 +5740,7 @@ void daAlink_c::playerInit() {
field_0x33b8 = tmp;
field_0x33bc = tmp;
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
offSwordModel();
field_0x3184 = -1;
@@ -5849,14 +5849,14 @@ int daAlink_c::setStartProcInit() {
setFaceBasicAnime(ANM_WAIT);
} else {
mEquipItem = (dComIfGs_getLastSceneMode() >> 0x18) & 0xFF;
if (mEquipItem == SWORD) {
if (mEquipItem == fpcNm_ITEM_SWORD) {
mEquipItem = 0x103;
} else if (checkStageName("D_MN09B") && last_mode != 8 && start_mode == 2) {
mEquipItem = 0x103;
}
if (mEquipItem == 0 || !checkCastleTownUseItem(mEquipItem) || (checkCloudSea() && mEquipItem != 0x103) || checkCanoeStart() || (horse_start && mEquipItem != 0x103 && !checkBowAndSlingItem(mEquipItem) && mEquipItem != BOOMERANG && mEquipItem != KANTERA && !checkHookshotItem(mEquipItem))) {
mEquipItem = NO_ITEM;
if (mEquipItem == 0 || !checkCastleTownUseItem(mEquipItem) || (checkCloudSea() && mEquipItem != 0x103) || checkCanoeStart() || (horse_start && mEquipItem != 0x103 && !checkBowAndSlingItem(mEquipItem) && mEquipItem != fpcNm_ITEM_BOOMERANG && mEquipItem != fpcNm_ITEM_KANTERA && !checkHookshotItem(mEquipItem))) {
mEquipItem = fpcNm_ITEM_NONE;
} else {
setItemModel();
}
@@ -6028,15 +6028,15 @@ static u8 data_80450FD1;
#pragma pop
inline bool checkCasualWearFlg() {
return dComIfGs_getSelectEquipClothes() == WEAR_CASUAL;
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL;
}
inline bool checkZoraWearFlg() {
return dComIfGs_getSelectEquipClothes() == WEAR_ZORA;
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA;
}
inline bool checkMagicArmorWearFlg() {
return dComIfGs_getSelectEquipClothes() == ARMOR;
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR;
}
/* 800A5CC8-800A660C 0A0608 0944+00 1/1 0/0 0/0 .text create__9daAlink_cFv */
@@ -6057,11 +6057,11 @@ int daAlink_c::create() {
if (!bgWaitFlg) {
// Event Flag: Finished Sewers
if (checkCasualWearFlg() && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) {
dComIfGs_setSelectEquipClothes(WEAR_KOKIRI);
dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI);
}
if (enteringCity && checkMagicArmorHeavy()) {
dComIfGs_setSelectEquipClothes(WEAR_KOKIRI);
dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI);
}
dComIfGp_setPlayer(0, this);
@@ -6223,8 +6223,8 @@ int daAlink_c::create() {
}
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == 0x11) {
if (!dComIfGs_isItemFirstBit(HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(SHIELD) &&
!dComIfGs_isItemFirstBit(WOOD_SHIELD))
if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD) &&
!dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD))
{
fopAcM_onSwitch(this, 0x6F);
} else {
@@ -7127,7 +7127,7 @@ void daAlink_c::setSwordPos() {
if (mEquipItem == 0x10B) {
mDoMtx_multVec(getCanoePaddleMatrix(), getCanoeLocalPaddleTop(), &field_0x3720);
} else if (mEquipItem == COPY_ROD) {
} else if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &copyRodTop, &field_0x3720);
} else {
field_0x3720 = mSwordTopPos;
@@ -7169,7 +7169,7 @@ void daAlink_c::setItemMatrix(int param_0) {
mZ2Link.setLinkSwordType(var_r28, var_r26);
if (mShieldChangeWaitTimer == 0) {
if (param_0 != 0 || (checkPlayerGuardAndAttack() && mEquipItem != IRONBALL && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) || mProcID == PROC_GUARD_BREAK || (mEquipItem == 0x103 && !checkEndResetFlg1(ERFLG1_GANON_FINISH) && !checkModeFlg(0x400))) {
if (param_0 != 0 || (checkPlayerGuardAndAttack() && mEquipItem != fpcNm_ITEM_IRONBALL && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) || mProcID == PROC_GUARD_BREAK || (mEquipItem == 0x103 && !checkEndResetFlg1(ERFLG1_GANON_FINISH) && !checkModeFlg(0x400))) {
mShieldModel->setBaseTRMtx(mpLinkModel->getAnmMtx(field_0x30c2));
if (i_checkShieldGet()) {
@@ -7281,10 +7281,10 @@ void daAlink_c::setItemMatrix(int param_0) {
}
} else if (checkHookshotItem(mEquipItem)) {
setHookshotPos();
} else if (mEquipItem == IRONBALL) {
} else if (mEquipItem == fpcNm_ITEM_IRONBALL) {
setIronBallPos();
} else {
if (mEquipItem == COPY_ROD && mProcID != PROC_COPY_ROD_REVIVE) {
if (mEquipItem == fpcNm_ITEM_COPY_ROD && mProcID != PROC_COPY_ROD_REVIVE) {
if (checkCopyRodTopUse()) {
field_0x0724->setFrame(field_0x0724->getFrameMax() - 0.001f);
} else {
@@ -7310,7 +7310,7 @@ void daAlink_c::setItemMatrix(int param_0) {
simpleAnmPlay(mpKanteraGlowBtk);
if (mProcID != PROC_OPEN_TREASURE && !checkEndResetFlg1(ERFLG1_UNK_4) && (mProcID != PROC_GET_ITEM || mProcVar4.field_0x3010 == 0)) {
if (mEquipItem == KANTERA || checkOilBottleItemNotGet(mEquipItem)) {
if (mEquipItem == fpcNm_ITEM_KANTERA || checkOilBottleItemNotGet(mEquipItem)) {
mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30c0));
mDoMtx_stack_c::transM(-2.0f, -0.1f, -0.7f);
mDoMtx_stack_c::XYZrotM(cM_deg2s(100.0f), cM_deg2s(9.3f), cM_deg2s(183.0f));
@@ -7625,7 +7625,7 @@ void daAlink_c::setAtCollision() {
mAtCps[0].SetAtVec(spA4);
dComIfG_Ccsp()->Set(&mAtCps[0]);
} else if (mProcID == PROC_BOTTLE_OPEN) {
if (mEquipItem == WATER_BOTTLE && mProcVar4.field_0x3010 != 0) {
if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar4.field_0x3010 != 0) {
mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTopPos, &spC8);
if (field_0x27c8.getKeepMinY() < spC8.y) {
@@ -7741,7 +7741,7 @@ void daAlink_c::setAtCollision() {
} else {
field_0xFB8.ResetAtHit();
}
} else if (mEquipItem == IRONBALL) {
} else if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mItemVar0.field_0x3018 == 2 || mItemVar0.field_0x3018 == 3 || mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 6) {
if (field_0xFB8.ChkAtSet()) {
@@ -8157,7 +8157,7 @@ static const daAlink_BckData kandelaarAnm[2] = {
/* 800AC450-800AC558 0A6D90 0108+00 23/23 0/0 0/0 .text
* getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM */
const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) const {
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (i_anmID == ANM_WAIT) {
return &kandelaarAnm[0];
}
@@ -8171,8 +8171,8 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID)
return &m_mainBckShield[i_anmID];
}
if ((mEquipItem == EQUIP_SWORD && i_anmID < 0x15 && i_anmID >= 0x10) ||
(i_anmID == ANM_SWIM_WAIT && mEquipItem != NO_ITEM))
if ((mEquipItem == 0x103 && i_anmID < 0x15 && i_anmID >= 0x10) ||
(i_anmID == ANM_SWIM_WAIT && mEquipItem != fpcNm_ITEM_NONE))
{
return &m_mainBckSword[i_anmID - 0x10];
}
@@ -11624,7 +11624,7 @@ void daAlink_c::decideCommonDoStatus() {
if (checkRoomOnly() && !checkWolf() && !temp_r3) {
if ((checkNoUpperAnime() || checkIronBallWaitAnime()) &&
(mEquipItem != NO_ITEM && checkModeFlg(4) && mEquipItem != 0x102))
(mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && mEquipItem != 0x102))
{
if (checkCopyRodControllAnime()) {
setDoStatus(0x2A);
@@ -11705,7 +11705,7 @@ void daAlink_c::decideCommonDoStatus() {
}
} else if (((checkNoUpperAnime()) || checkIronBallWaitAnime() ||
checkCopyRodControllAnime()) &&
mEquipItem != NO_ITEM && checkModeFlg(4) && field_0x33a8 <= temp_f31)
mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && field_0x33a8 <= temp_f31)
{
if (mEquipItem == 0x102) {
if (checkAttentionState()) {
@@ -12187,7 +12187,7 @@ BOOL daAlink_c::checkAutoJumpAction() {
sp18 = 60.0f;
}
if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(FAIRY)) {
if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) {
if (!checkGoronSideMove() && (!checkNotAutoJumpStage() || checkWolf())) {
if (field_0x3178 != 3 && !checkEndResetFlg0(ERFLG0_NOT_AUTO_JUMP)) {
if (sp14 >= sp10 && (!checkBootsOrArmorHeavy() || checkIronBallWaitAnime()) && (field_0x33a8 > 0.85f || (checkIronBallWaitAnime() && field_0x33ac > 0.85f) || mProcID == PROC_WOLF_GIANT_PUZZLE || checkEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP)) && cLib_distanceAngleS(temp_r26, shape_angle.y) < 0x800) {
@@ -12270,7 +12270,7 @@ BOOL daAlink_c::checkAutoJumpAction() {
/* 800B69CC-800B6A30 0B130C 0064+00 2/2 0/0 0/0 .text checkCutJumpInFly__9daAlink_cFv */
BOOL daAlink_c::checkCutJumpInFly() {
if ((mEquipItem == EQUIP_SWORD && checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) {
if ((mEquipItem == 0x103 && checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) {
return procCutJumpInit(1);
}
return false;
@@ -12404,9 +12404,9 @@ BOOL daAlink_c::checkFrontWallTypeAction() {
int daAlink_c::checkItemActionInitStart() {
if (checkBowAndSlingItem(mEquipItem)) {
return checkNextActionBow();
} else if (mEquipItem == BOOMERANG) {
} else if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
return checkNextActionBoomerang();
} else if (mEquipItem == COPY_ROD) {
} else if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
if (mCopyRodAcKeep.getActor() == NULL) {
return checkNextActionCopyRod();
}
@@ -12417,13 +12417,13 @@ int daAlink_c::checkItemActionInitStart() {
} else if (checkFishingRodItem(mEquipItem)) {
onResetFlg1(RFLG1_UNK_80);
return 1;
} else if (mEquipItem == IRONBALL) {
} else if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (!checkIronBallAnime()) {
return checkNextActionIronBall();
}
} else if (mEquipItem == EMPTY_BOTTLE) {
} else if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) {
return procBottleSwingInit(NULL, 0);
} else if (mEquipItem == KANTERA) {
} else if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (!checkModeFlg(0x400)) {
return procKandelaarSwingInit();
}
@@ -12437,7 +12437,7 @@ int daAlink_c::checkItemActionInitStart() {
/* 800B7090-800B7168 0B19D0 00D8+00 1/1 0/0 0/0 .text checkItemChangeAutoAction__9daAlink_cFv */
int daAlink_c::checkItemChangeAutoAction() {
if (checkResetFlg0(RFLG0_UNK_80)) {
if (mEquipItem == EQUIP_SWORD) {
if (mEquipItem == 0x103) {
if (checkModeFlg(0x40000)) {
return 0;
}
@@ -12486,7 +12486,7 @@ int daAlink_c::cancelUpperItemReadyAnime(int param_0) {
{
seStartSystem(0x6F);
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
mItemVar0.field_0x3018 = 8;
procIronBallReturnInit();
} else {
@@ -12509,7 +12509,7 @@ BOOL daAlink_c::checkItemActorPointer() {
mItemAcKeep.clearData();
resetUpperAnime(UPPER_2, -1.0f);
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
if (checkModeFlg(MODE_RIDING)) {
if (checkCanoeRide()) {
@@ -12558,9 +12558,9 @@ bool daAlink_c::checkSwordTwirlAction() {
BOOL daAlink_c::checkUpperItemActionFly() {
if (checkBowAndSlingItem(mEquipItem)) {
checkUpperItemActionBowFly();
} else if (mEquipItem == BOOMERANG) {
} else if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
checkUpperItemActionBoomerangFly();
} else if (mEquipItem == COPY_ROD) {
} else if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
checkUpperItemActionCopyRodFly();
}
@@ -12570,7 +12570,7 @@ BOOL daAlink_c::checkUpperItemActionFly() {
/* 800B7528-800B75EC 0B1E68 00C4+00 1/1 0/0 0/0 .text checkItemButtonChange__9daAlink_cFv
*/
void daAlink_c::checkItemButtonChange() {
if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != NO_ITEM && !checkEquipAnime()) {
if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != fpcNm_ITEM_NONE && !checkEquipAnime()) {
u8 temp_r0;
for (u8 i = 0; i < 2; i++) {
temp_r0 = (i + 1) % 2;
@@ -12588,9 +12588,9 @@ void daAlink_c::checkItemButtonChange() {
BOOL daAlink_c::checkUpperItemAction() {
if (checkNoUpperAnime()) {
if (checkModeFlg(0x1000)) {
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
setIronBallWaitUpperAnime(0);
} else if (mEquipItem == COPY_ROD) {
} else if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
setCopyRodControllAnime();
}
}
@@ -12700,9 +12700,9 @@ BOOL daAlink_c::checkUpperItemAction() {
if (checkUpperItemActionIronBall()) {
return true;
}
} else if (mEquipItem == IRONBALL) {
} else if (mEquipItem == fpcNm_ITEM_IRONBALL) {
setIronBallWaitUpperAnime(0);
} else if (mEquipItem == COPY_ROD) {
} else if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
setCopyRodControllAnime();
}
@@ -13005,7 +13005,7 @@ u16 daAlink_c::getReadyItem() {
/* 800B8930-800B8988 0B3270 0058+00 11/11 0/0 0/0 .text checkReadyItem__9daAlink_cFv */
bool daAlink_c::checkReadyItem() {
if (mEquipItem == NO_ITEM) {
if (mEquipItem == fpcNm_ITEM_NONE) {
return false;
}
@@ -13318,7 +13318,7 @@ void daAlink_c::swordUnequip() {
/* 800B9640-800B96A4 0B3F80 0064+00 6/6 0/0 0/0 .text itemEquip__9daAlink_cFUs */
void daAlink_c::itemEquip(u16 i_itemID) {
if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != BOOMERANG) {
if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != fpcNm_ITEM_BOOMERANG) {
field_0x2fde = i_itemID;
dComIfGp_clearPlayerStatus0(0, 0x400000);
offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER);
@@ -13337,8 +13337,8 @@ void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) {
u16 anm_id;
const daAlinkHIO_anm_c* anm_data;
if (i_itemID == BOOMERANG || i_itemID == COPY_ROD || i_itemID == KANTERA ||
i_itemID == HOOKSHOT || checkBottleItem(i_itemID))
if (i_itemID == fpcNm_ITEM_BOOMERANG || i_itemID == fpcNm_ITEM_COPY_ROD || i_itemID == fpcNm_ITEM_KANTERA ||
i_itemID == fpcNm_ITEM_HOOKSHOT || checkBottleItem(i_itemID))
{
anm_id = 0x247;
anm_data = &daAlinkHIO_item_c0::m.mOneHandEquipAnm;
@@ -13373,19 +13373,19 @@ bool daAlink_c::checkFastUnequip() {
/* 800B983C-800B994C 0B417C 0110+00 10/10 0/0 0/0 .text allUnequip__9daAlink_cFi */
void daAlink_c::allUnequip(int param_0) {
if (checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() &&
mEquipItem != KANTERA)
mEquipItem != fpcNm_ITEM_KANTERA)
{
for (u8 i = 0; i < 2; i++) {
if (dComIfGp_getSelectItem(i) == KANTERA) {
if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) {
mSelectItemId = i;
}
}
itemEquip(KANTERA);
itemEquip(fpcNm_ITEM_KANTERA);
onNoResetFlg1(FLG1_UNK_40);
return;
} else if (mEquipItem == EQUIP_SWORD) {
} else if (mEquipItem == 0x103) {
swordUnequip();
} else if (mEquipItem == noentry71) {
} else if (mEquipItem == 0x102) {
deleteEquipItem(0, 0);
field_0x2060->initOldFrameMorf(5.0f, 0, 35);
} else {
@@ -13400,7 +13400,7 @@ BOOL daAlink_c::checkItemChangeFromButton() {
if (checkModeFlg(4) && !checkEquipAnime() && !checkBoomerangThrowAnime() &&
!checkCopyRodThrowAnime() && !checkKandelaarSwingAnime() && !checkKandelaarSwingAnime())
{
if (dComIfGs_getSelectEquipSword() != NO_ITEM && !checkNotBattleStage() &&
if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE && !checkNotBattleStage() &&
!checkCanoeRide() && (!checkModeFlg(0x40000) || checkEquipHeavyBoots()) &&
mEquipItem != 0x103 && swordTrigger())
{
@@ -13423,27 +13423,27 @@ BOOL daAlink_c::checkItemChangeFromButton() {
}
if (doTrigger() && dComIfGp_getDoStatus() == 4) {
if (mEquipItem != KANTERA && checkNoResetFlg2(FLG2_UNK_1)) {
if (mEquipItem != fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) {
offKandelaarModel();
} else if (mSwordFlourishTimer != 0 && mEquipItem == EQUIP_SWORD &&
} else if (mSwordFlourishTimer != 0 && mEquipItem == 0x103 &&
!checkWoodSwordEquip() && !checkModeFlg(0x402))
{
return procSwordUnequipSpInit();
} else {
allUnequip(1);
}
} else if (mEquipItem == NO_ITEM && mThrowBoomerangAcKeep.getActor() == NULL &&
} else if (mEquipItem == fpcNm_ITEM_NONE && mThrowBoomerangAcKeep.getActor() == NULL &&
!checkCanoeRide() && checkNoUpperAnime() && checkNoResetFlg2(FLG2_UNK_1))
{
for (i = 0; i < 2; i++) {
if (dComIfGp_getSelectItem(i) == KANTERA) {
if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) {
mSelectItemId = i;
}
}
itemEquip(KANTERA);
itemEquip(fpcNm_ITEM_KANTERA);
onNoResetFlg1(FLG1_UNK_40);
} else if (mEquipItem != 0x103 && mEquipItem != NO_ITEM && mEquipItem != 0x10B &&
} else if (mEquipItem != 0x103 && mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B &&
mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure()))
{
if (!checkEventRun() ||
@@ -13595,7 +13595,7 @@ int daAlink_c::checkNextAction(int param_0) {
setSpeedAndAngleAtn();
} else if (((!checkUpperReadyThrowAnime() || mFastShotTime != 0) ||
(checkBoomerangThrowAnime() &&
(mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == noentry71 ||
(mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == 0x102 ||
checkNoResetFlg1(FLG1_UNK_2)))) ||
(checkCopyRodThrowAnime() &&
(mCopyRodAcKeep.getActor() != NULL || checkNoResetFlg1(FLG1_UNK_10000))))
@@ -13700,11 +13700,11 @@ int daAlink_c::checkNextAction(int param_0) {
/* 800BA6A0-800BA914 0B4FE0 0274+00 3/3 0/0 0/0 .text commonChangeItem__9daAlink_cFv */
void daAlink_c::commonChangeItem() {
if (mEquipItem == KANTERA && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) {
if (mEquipItem == fpcNm_ITEM_KANTERA && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) {
offKandelaarModel();
}
if ((mEquipItem == NO_ITEM && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) {
if ((mEquipItem == fpcNm_ITEM_NONE && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) {
seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT);
}
@@ -13722,7 +13722,7 @@ void daAlink_c::commonChangeItem() {
}
BOOL var_r30;
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
var_r30 = true;
deleteEquipItem(TRUE, FALSE);
} else {
@@ -13730,7 +13730,7 @@ void daAlink_c::commonChangeItem() {
}
mEquipItem = field_0x2fde;
field_0x2fde = NO_ITEM;
field_0x2fde = fpcNm_ITEM_NONE;
if (checkReinRide()) {
field_0x2060->initOldFrameMorf(3.0f, 0, 0x23);
@@ -13757,7 +13757,7 @@ void daAlink_c::commonChangeItem() {
/* 800BA914-800BAF08 0B5254 05F4+00 1/1 0/0 0/0 .text setItemAction__9daAlink_cFv */
void daAlink_c::setItemAction() {
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
checkIronBallDelete();
}
@@ -14789,13 +14789,13 @@ void daAlink_c::setLastSceneMode(u32* o_mode) {
*o_mode |= 0x800000;
}
if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA) {
if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != fpcNm_ITEM_KANTERA) {
*o_mode |= 0x200000;
}
if (mEquipItem == EQUIP_SWORD) {
if (mEquipItem == 0x103) {
*o_mode |= 0x28000000;
} else if (mEquipItem < NO_ITEM) {
} else if (mEquipItem < fpcNm_ITEM_NONE) {
*o_mode |= mEquipItem << 0x18;
}
@@ -15318,7 +15318,7 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
cXyz sp3C;
cXyz sp30(mHeldItemRootPos);
if (checkHookshotItem(mEquipItem) || mEquipItem == PACHINKO) {
if (checkHookshotItem(mEquipItem) || mEquipItem == fpcNm_ITEM_PACHINKO) {
var_r29 = &sp30;
} else if (checkBowItem(mEquipItem) && mItemAcKeep.getActor() != NULL) {
var_r29 = &mItemAcKeep.getActor()->current.pos;
@@ -15344,12 +15344,12 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
}
sp30 -= sp3C * 100.0f;
} else if (mEquipItem == COPY_ROD) {
} else if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
return 0;
}
dBgS_LinChk* var_r30;
if (mEquipItem == BOOMERANG) {
if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
var_r30 = &mBoomerangLinChk;
} else if (mProcID == PROC_HAWK_SUBJECT) {
var_r30 = &mLinkLinChk;
@@ -15396,7 +15396,7 @@ void daAlink_c::keepItemData() {
void daAlink_c::returnKeepItemData() {
deleteEquipItem(FALSE, FALSE);
mEquipItem = mKeepItem;
mKeepItem = NO_ITEM;
mKeepItem = fpcNm_ITEM_NONE;
makeItemType();
}
@@ -15407,22 +15407,22 @@ BOOL daAlink_c::setItemModel() {
return 1;
}
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
setSlingModel();
return 1;
}
if (mEquipItem == COPY_ROD) {
if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
setCopyRodModel();
return mCopyRodAcKeep.getActor() != NULL ? 1 : 0;
}
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
setKandelaarModel();
return 1;
}
if (mEquipItem == EMPTY_BOTTLE) {
if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) {
setBottleModel(mEquipItem);
return 1;
}
@@ -15432,12 +15432,12 @@ BOOL daAlink_c::setItemModel() {
return 1;
}
if (mEquipItem == EQUIP_SWORD) {
if (mEquipItem == 0x103) {
setSwordModel();
return 1;
}
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
setIronBallModel();
setIronBallWaitUpperAnime(1);
return mItemAcKeep.getActor() != NULL ? 1 : 0;
@@ -15448,7 +15448,7 @@ BOOL daAlink_c::setItemModel() {
/* 800BF9F0-800BFD74 0BA330 0384+00 4/4 0/0 0/0 .text setItemActor__9daAlink_cFv */
BOOL daAlink_c::setItemActor() {
if (mEquipItem == BOOMERANG) {
if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, &current.pos, -1,
NULL, NULL, -1, NULL, NULL);
if (actor == NULL) {
@@ -15461,7 +15461,7 @@ BOOL daAlink_c::setItemActor() {
return 1;
}
if (mEquipItem == COPY_ROD) {
if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, &current.pos, -1, NULL,
NULL, -1, NULL, NULL);
if (actor == NULL) {
@@ -15474,7 +15474,7 @@ BOOL daAlink_c::setItemActor() {
return 1;
}
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
fopAc_ac_c* actor = daCrod_c::makeIronBallDummy(this);
if (actor == NULL) {
@@ -15507,7 +15507,7 @@ BOOL daAlink_c::setItemActor() {
if (!dComIfGp_getHorseActor()->checkNoBombProc() &&
(mProcID != PROC_HORSE_TURN || !checkModeFlg(MODE_DISABLE_ITEMS)))
{
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
return 1;
}
}
@@ -15515,7 +15515,7 @@ BOOL daAlink_c::setItemActor() {
cXyz create_pos = (mLeftHandPos + mRightHandPos) * 0.5f;
if (checkReadyItem()) {
fopAc_ac_c* actor;
if (mEquipItem == NORMAL_BOMB) {
if (mEquipItem == fpcNm_ITEM_NORMAL_BOMB) {
actor = dBomb_c::createNormalBombPlayer(&create_pos);
} else {
actor = dBomb_c::createWaterBombPlayer(&create_pos);
@@ -15529,7 +15529,7 @@ BOOL daAlink_c::setItemActor() {
setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor);
}
}
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
return 1;
}
@@ -15544,11 +15544,11 @@ void daAlink_c::makeItemType() {
}
bool daPy_py_c::checkZoraWearFlg() const {
return dComIfGs_getSelectEquipClothes() == WEAR_ZORA;
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA;
}
bool daPy_py_c::checkMagicArmorWearFlg() const {
return dComIfGs_getSelectEquipClothes() == ARMOR;
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR;
}
/* 800BFDB0-800BFDFC 0BA6F0 004C+00 28/28 0/0 0/0 .text checkZoraWearAbility__9daAlink_cCFv */
@@ -15655,7 +15655,7 @@ int daAlink_c::checkGroupItem(int i_itemNo, int i_selItem) const {
int daAlink_c::checkSetItemTrigger(int i_itemNo) {
for (u8 i = 0; i < 2; i++) {
if (checkGroupItem(i_itemNo, dComIfGp_getSelectItem(i)) && itemTriggerCheck(1 << i)) {
if (i_itemNo != HVY_BOOTS) {
if (i_itemNo != fpcNm_ITEM_HVY_BOOTS) {
mSelectItemId = i;
}
return 1;
@@ -15747,12 +15747,12 @@ bool daAlink_c::checkNotAutoJumpStage() {
/* 800C0678-800C077C 0BAFB8 0104+00 3/3 0/0 0/0 .text checkCastleTownUseItem__9daAlink_cFUs */
bool daAlink_c::checkCastleTownUseItem(u16 i_itemNo) {
if (checkNotBattleStage()) {
if (i_itemNo == KANTERA || checkTradeItem(i_itemNo) ||
(i_itemNo == DUNGEON_BACK && checkLv7DungeonShop()) ||
(checkRoomSpecial() && (i_itemNo == EMPTY_BOTTLE || checkDungeonWarpItem(i_itemNo))) ||
(checkStageName("R_SP128") && i_itemNo == COPY_ROD) ||
(checkLv2DungeonRoomSpecial() && i_itemNo == HVY_BOOTS) ||
(checkBottleItem(i_itemNo) && i_itemNo != EMPTY_BOTTLE))
if (i_itemNo == fpcNm_ITEM_KANTERA || checkTradeItem(i_itemNo) ||
(i_itemNo == fpcNm_ITEM_DUNGEON_BACK && checkLv7DungeonShop()) ||
(checkRoomSpecial() && (i_itemNo == fpcNm_ITEM_EMPTY_BOTTLE || checkDungeonWarpItem(i_itemNo))) ||
(checkStageName("R_SP128") && i_itemNo == fpcNm_ITEM_COPY_ROD) ||
(checkLv2DungeonRoomSpecial() && i_itemNo == fpcNm_ITEM_HVY_BOOTS) ||
(checkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_EMPTY_BOTTLE))
{
return true;
} else {
@@ -15829,13 +15829,13 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) {
} else if (i_procType == ITEM_PROC_OFF_KANDELAAR) {
offKandelaarModel();
} else if (i_procType == ITEM_PROC_COMMON_CHANGE_ITEM) {
field_0x2fde = NO_ITEM;
field_0x2fde = fpcNm_ITEM_NONE;
itemEquip(sel_item);
if (dComIfGp_checkPlayerStatus0(0, 0x2000) &&
((checkBowAndSlingItem(field_0x2fde) || checkHookshotItem(field_0x2fde) ||
field_0x2fde == COPY_ROD) ||
field_0x2fde == BOOMERANG))
field_0x2fde == fpcNm_ITEM_COPY_ROD) ||
field_0x2fde == fpcNm_ITEM_BOOMERANG))
{
commonChangeItem();
resetUpperAnime(UPPER_2, -1.0f);
@@ -15857,35 +15857,35 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) {
int daAlink_c::checkNewItemChange(u8 param_0) {
u32 sel_item = dComIfGp_getSelectItem(param_0);
if (checkSpinnerRide() || sel_item == BOMB_BAG_LV1 ||
((sel_item == KANTERA || checkOilBottleItem(sel_item)) &&
if (checkSpinnerRide() || sel_item == fpcNm_ITEM_BOMB_BAG_LV1 ||
((sel_item == fpcNm_ITEM_KANTERA || checkOilBottleItem(sel_item)) &&
checkWaterInKandelaarOffset(mWaterY)) ||
(checkCanoeRide() && checkStageName("F_SP127")) || checkCloudSea() ||
((checkModeFlg(0x40000) || checkNoResetFlg0(FLG0_UNDERWATER)) &&
!checkAcceptUseItemInWater(sel_item)) ||
(checkModeFlg(0x40000) && sel_item == WATER_BOMB) || !checkCastleTownUseItem(sel_item) ||
(checkModeFlg(0x40000) && sel_item == fpcNm_ITEM_WATER_BOMB) || !checkCastleTownUseItem(sel_item) ||
(checkBoardRide() && sel_item != 0x103) ||
(checkModeFlg(0x400) &&
(sel_item == EMPTY_BOTTLE || sel_item == POKE_BOMB || sel_item == IRONBALL ||
sel_item == COPY_ROD || checkFishingRodItem(sel_item))) ||
(sel_item == fpcNm_ITEM_EMPTY_BOTTLE || sel_item == fpcNm_ITEM_POKE_BOMB || sel_item == fpcNm_ITEM_IRONBALL ||
sel_item == fpcNm_ITEM_COPY_ROD || checkFishingRodItem(sel_item))) ||
((mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || field_0x2fbd == 1 || field_0x2fbd == 2 ||
mWaterY - current.pos.y > 45.0f ||
(field_0x2fbc == 6 && mWaterY - current.pos.y >= 0.0f) || field_0x2fbd == 3) &&
sel_item == SPINNER) ||
sel_item == fpcNm_ITEM_SPINNER) ||
(checkBossRoom() && checkDungeonWarpItem(sel_item)) ||
(sel_item == DUNGEON_EXIT &&
(sel_item == fpcNm_ITEM_DUNGEON_EXIT &&
(checkLv7DungeonShop() ||
(checkStageName("D_MN07") && fopAcM_isSwitch(this, 0x4D) &&
!fopAcM_isSwitch(this, 0x18)) ||
(checkStageName("D_MN10") && fopAcM_GetRoomNo(this) == 15))) ||
(checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) &&
sel_item != HVY_BOOTS && !checkBowItem(sel_item)))
sel_item != fpcNm_ITEM_HVY_BOOTS && !checkBowItem(sel_item)))
{
return ITEM_PROC_NONE;
} else if (sel_item == HVY_BOOTS || checkDungeonWarpItem(sel_item) ||
} else if (sel_item == fpcNm_ITEM_HVY_BOOTS || checkDungeonWarpItem(sel_item) ||
checkTradeItem(sel_item) ||
(checkBottleItem(sel_item) && sel_item != EMPTY_BOTTLE) || sel_item == SPINNER ||
sel_item == POKE_BOMB || sel_item == HORSE_FLUTE || sel_item == HAWK_EYE)
(checkBottleItem(sel_item) && sel_item != fpcNm_ITEM_EMPTY_BOTTLE) || sel_item == fpcNm_ITEM_SPINNER ||
sel_item == fpcNm_ITEM_POKE_BOMB || sel_item == fpcNm_ITEM_HORSE_FLUTE || sel_item == fpcNm_ITEM_HAWK_EYE)
{
if (checkReinRide() || checkCanoeRide()) {
if (checkDrinkBottleItem(sel_item)) {
@@ -15895,7 +15895,7 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
if (checkOilBottleItem(sel_item) && checkItemSetButton(0x48) != 2) {
return ITEM_PROC_KANDELAAR_POUR;
}
} else if (sel_item == HVY_BOOTS) {
} else if (sel_item == fpcNm_ITEM_HVY_BOOTS) {
if (!checkBoardRide()) {
if ((mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) ||
(checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) ||
@@ -15911,7 +15911,7 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
}
} else if (mLinkAcch.ChkGroundHit()) {
if (!checkModeFlg(0x70C52)) {
if (sel_item == SPINNER) {
if (sel_item == fpcNm_ITEM_SPINNER) {
cXyz sp38(current.pos.x, current.pos.y + l_autoUpHeight, current.pos.z);
cXyz sp2C(sp38);
cXyz sp20;
@@ -15938,17 +15938,17 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
} else if (checkDungeonWarpItem(sel_item)) {
return ITEM_PROC_DUNGEON_WARP_READY;
} else if (checkItemSetButton(0x108) != 2 &&
(sel_item == WORM || sel_item == BEE_CHILD))
(sel_item == fpcNm_ITEM_WORM || sel_item == fpcNm_ITEM_BEE_CHILD))
{
int temp_r3_8 = dComIfGp_getSelectItem(checkItemSetButton(0x108));
if (temp_r3_8 == WORM_ROD || temp_r3_8 == JEWEL_WORM_ROD) {
if (sel_item == BEE_CHILD) {
if (temp_r3_8 == fpcNm_ITEM_WORM_ROD || temp_r3_8 == fpcNm_ITEM_JEWEL_WORM_ROD) {
if (sel_item == fpcNm_ITEM_BEE_CHILD) {
return ITEM_PROC_BOTTLE_DRINK;
}
return ITEM_PROC_NONE;
}
if (sel_item == BEE_CHILD &&
(temp_r3_8 == BEE_ROD || temp_r3_8 == JEWEL_BEE_ROD))
if (sel_item == fpcNm_ITEM_BEE_CHILD &&
(temp_r3_8 == fpcNm_ITEM_BEE_ROD || temp_r3_8 == fpcNm_ITEM_JEWEL_BEE_ROD))
{
return ITEM_PROC_BOTTLE_DRINK;
}
@@ -15959,26 +15959,26 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
return ITEM_PROC_BOTTLE_OPEN;
} else if (checkTradeItem(sel_item)) {
return ITEM_PROC_NOT_USE_ITEM;
} else if (sel_item == HORSE_FLUTE) {
} else if (sel_item == fpcNm_ITEM_HORSE_FLUTE) {
return ITEM_PROC_GRASS_WHISTLE;
} else if (checkOilBottleItem(sel_item) && checkItemSetButton(0x48) != 2) {
return ITEM_PROC_KANDELAAR_POUR;
} else if (sel_item == HAWK_EYE) {
} else if (sel_item == fpcNm_ITEM_HAWK_EYE) {
if (acceptSubjectModeChange()) {
return ITEM_PROC_SUBJECTIVITY;
}
} else if (sel_item == POKE_BOMB && dComIfGp_getSelectItemNum(param_0) &&
} else if (sel_item == fpcNm_ITEM_POKE_BOMB && dComIfGp_getSelectItemNum(param_0) &&
field_0x2fcf < 2)
{
return ITEM_PROC_PICK_PUT;
}
}
}
} else if (sel_item != NO_ITEM && mEquipItem != sel_item) {
} else if (sel_item != fpcNm_ITEM_NONE && mEquipItem != sel_item) {
if ((checkBombItem(sel_item) && !dComIfGp_getSelectItemNum(param_0)) ||
((sel_item == NORMAL_BOMB || sel_item == WATER_BOMB) && mActiveBombNum >= 3) ||
(sel_item == IRONBALL && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) ||
(sel_item == KANTERA && (checkNoResetFlg0(FLG0_UNDERWATER) ||
((sel_item == fpcNm_ITEM_NORMAL_BOMB || sel_item == fpcNm_ITEM_WATER_BOMB) && mActiveBombNum >= 3) ||
(sel_item == fpcNm_ITEM_IRONBALL && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) ||
(sel_item == fpcNm_ITEM_KANTERA && (checkNoResetFlg0(FLG0_UNDERWATER) ||
checkEndResetFlg1(ERFLG1_UNK_4) || checkModeFlg(0x40000))))
{
return ITEM_PROC_NONE;
@@ -15986,7 +15986,7 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
return ITEM_PROC_COMMON_CHANGE_ITEM;
}
if (mEquipItem == sel_item && mSelectItemId != param_0 && mEquipItem == EMPTY_BOTTLE) {
if (mEquipItem == sel_item && mSelectItemId != param_0 && mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) {
return ITEM_PROC_BOTTLE_SWING;
}
@@ -15997,11 +15997,11 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) {
if (i_deleteKantera || mProcID == PROC_UNEQUIP) {
offKandelaarModel();
} else if (mEquipItem == KANTERA && checkNoResetFlg2(FLG2_UNK_1)) {
} else if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) {
mZ2Link.setKanteraState(2);
}
if (mEquipItem == NO_ITEM || mEquipItem == 0x10B) {
if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == 0x10B) {
return;
}
@@ -16014,7 +16014,7 @@ void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) {
} else {
seStartOnlyReverb(Z2SE_AL_SWORD_PUTIN);
}
} else if (mEquipItem < NO_ITEM) {
} else if (mEquipItem < fpcNm_ITEM_NONE) {
seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT);
}
}
@@ -16037,16 +16037,16 @@ void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) {
fopAcM_delete(item_actor);
}
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
mZ2Link.setUsingIronBall(false);
} else if (checkHookshotItem(mEquipItem)) {
cancelHookshotCarry();
}
if (((mEquipItem == BOOMERANG || mEquipItem == 0x102) && checkBoomerangAnime()) ||
(mEquipItem == COPY_ROD && checkCopyRodAnime()) ||
if (((mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkBoomerangAnime()) ||
(mEquipItem == fpcNm_ITEM_COPY_ROD && checkCopyRodAnime()) ||
(checkHookshotItem(mEquipItem) && checkHookshotAnime()) ||
(mEquipItem == IRONBALL && (checkIronBallAnime() || checkIronBallWaitAnime())) ||
(mEquipItem == fpcNm_ITEM_IRONBALL && (checkIronBallAnime() || checkIronBallWaitAnime())) ||
(checkBowAndSlingItem(mEquipItem) && checkBowAnime()))
{
resetUpperAnime(UPPER_2, -1.0f);
@@ -16057,7 +16057,7 @@ void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) {
}
mItemAcKeep.clearData();
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
mHeldItemModel = NULL;
mpHookTipModel = NULL;
field_0x0710 = NULL;
@@ -16571,7 +16571,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
}
if (checkBombItem(mEquipItem)) {
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
}
}
@@ -16608,7 +16608,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
dComIfGp_clearPlayerStatus1(0, 0x7fb7b78);
cancelHookshotShot();
if (mEquipItem == noentry77) {
if (mEquipItem == 0x109) {
deleteEquipItem(FALSE, FALSE);
}
src/d/actor/d_a_alink_boom.inc
+7 -7
View File
@@ -84,7 +84,7 @@ fopAc_ac_c* daAlink_c::getBoomerangActor() {
return mThrowBoomerangAcKeep.getActor();
}
if (mEquipItem == BOOMERANG) {
if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
return mItemAcKeep.getActor();
}
@@ -147,7 +147,7 @@ BOOL daAlink_c::checkBoomerangAnime() const {
/* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */
BOOL daAlink_c::checkBoomerangThrowAnime() const {
return (mEquipItem == BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == noentry71) &&
return (mEquipItem == fpcNm_ITEM_BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) &&
checkUpperAnime(0x53);
}
@@ -185,7 +185,7 @@ void daAlink_c::setBoomerangCatchAnime() {
setFacePriBck(0xE8);
field_0x2f97 = 254;
if (mEquipItem != COPY_ROD) {
if (mEquipItem != fpcNm_ITEM_COPY_ROD) {
seStartOnlyReverb(JA_SE_LK_BOOM_CATCH);
}
}
@@ -220,13 +220,13 @@ void daAlink_c::throwBoomerang() {
fopAcM_cancelCarryNow(item);
item = NULL;
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
field_0x2f94 = 0xFF;
field_0x2f96 = 0xFE;
}
mItemAcKeep.clearData();
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
field_0x2f94 = 0xFF;
field_0x2f96 = 0xFE;
@@ -259,7 +259,7 @@ void daAlink_c::throwBoomerang() {
int daAlink_c::returnBoomerang(int param_0) {
dComIfGp_clearPlayerStatus0(0, 0x400000);
if (mEquipItem == NO_ITEM && !checkMagneBootsOn() && mItemAcKeep.getActor() == NULL &&
if (mEquipItem == fpcNm_ITEM_NONE && !checkMagneBootsOn() && mItemAcKeep.getActor() == NULL &&
!checkBoardRide() && !checkBoarRide() && !checkWolf() &&
(mProcID != PROC_HANG_READY || field_0x3198 != 3) && (!checkEventRun() || param_0 != 0) &&
(checkNoUpperAnime() || checkPlayerGuard() || checkHorseTurnAnime() ||
@@ -268,7 +268,7 @@ int daAlink_c::returnBoomerang(int param_0) {
mItemAcKeep = mThrowBoomerangAcKeep;
mThrowBoomerangAcKeep.clearData();
mEquipItem = BOOMERANG;
mEquipItem = fpcNm_ITEM_BOOMERANG;
field_0x2f94 = 2;
onNoResetFlg0(FLG0_UNK_20);
src/d/actor/d_a_alink_bottle.inc
+67 -67
View File
@@ -64,21 +64,21 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
field_0x0718 = loadAramItemBtk(0x32B, mHeldItemModel);
if (i_itemNo == FAIRY) {
if (i_itemNo == fpcNm_ITEM_FAIRY) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
JUT_ASSERT(142, 0);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == WORM) {
} else if (i_itemNo == fpcNm_ITEM_WORM) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
JUT_ASSERT(151, 0);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == BEE_CHILD) {
} else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) {
mpHookTipModel = initModel(loadAramBmd(0x31C, 0x1000), 0);
}
@@ -97,40 +97,40 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
mItemMode = 0;
}
if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != BEE_CHILD) || checkOilBottleItem(i_itemNo)) {
if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_BEE_CHILD) || checkOilBottleItem(i_itemNo)) {
item_model_data->getMaterialNodePointer(0)->getShape()->hide();
if (i_itemNo == RED_BOTTLE || i_itemNo == CHUCHU_RED || i_itemNo == RED_BOTTLE_2) {
if (i_itemNo == fpcNm_ITEM_RED_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_RED || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2) {
field_0x0724->setFrame(0.0f);
} else if (i_itemNo == GREEN_BOTTLE || i_itemNo == CHUCHU_GREEN) {
} else if (i_itemNo == fpcNm_ITEM_GREEN_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_GREEN) {
field_0x0724->setFrame(1.0f);
} else if (i_itemNo == BLUE_BOTTLE || i_itemNo == CHUCHU_BLUE) {
} else if (i_itemNo == fpcNm_ITEM_BLUE_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_BLUE) {
field_0x0724->setFrame(2.0f);
} else if (checkOilBottleItem(i_itemNo)) {
field_0x0724->setFrame(4.0f);
} else if (i_itemNo == HOT_SPRING) {
} else if (i_itemNo == fpcNm_ITEM_HOT_SPRING) {
field_0x0724->setFrame(5.0f);
} else if (i_itemNo == CHUCHU_PURPLE) {
} else if (i_itemNo == fpcNm_ITEM_CHUCHU_PURPLE) {
field_0x0724->setFrame(6.0f);
} else if (i_itemNo == CHUCHU_RARE) {
} else if (i_itemNo == fpcNm_ITEM_CHUCHU_RARE) {
field_0x0724->setFrame(7.0f);
} else if (i_itemNo == UGLY_SOUP || i_itemNo == CHUCHU_BLACK) {
} else if (i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK) {
field_0x0724->setFrame(8.0f);
} else if (i_itemNo == LV1_SOUP) {
} else if (i_itemNo == fpcNm_ITEM_LV1_SOUP) {
field_0x0724->setFrame(9.0f);
} else if (i_itemNo == LV2_SOUP || i_itemNo == LV3_SOUP) {
} else if (i_itemNo == fpcNm_ITEM_LV2_SOUP || i_itemNo == fpcNm_ITEM_LV3_SOUP) {
field_0x0724->setFrame(10.0f);
} else if (i_itemNo == FAIRY_DROP) {
} else if (i_itemNo == fpcNm_ITEM_FAIRY_DROP) {
field_0x0724->setFrame(11.0f);
} else {
field_0x0724->setFrame(3.0f);
if (i_itemNo == HALF_MILK_BOTTLE) {
if (i_itemNo == fpcNm_ITEM_HALF_MILK_BOTTLE) {
field_0x072c->setFrame(1.0f);
}
}
} else if (checkOpenBottleItem(i_itemNo)) {
if (i_itemNo == WATER_BOTTLE) {
if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) {
field_0x0724->setFrame(5.0f);
} else {
field_0x072c->setFrame(2.0f);
@@ -170,29 +170,29 @@ int daAlink_c::commonBottleDrink(int param_0) {
mItemVar0.mBottleItemHealAmount = 0;
if (mEquipItem != UGLY_SOUP && mEquipItem != CHUCHU_BLACK &&
mEquipItem != CHUCHU_PURPLE)
if (mEquipItem != fpcNm_ITEM_UGLY_SOUP && mEquipItem != fpcNm_ITEM_CHUCHU_BLACK &&
mEquipItem != fpcNm_ITEM_CHUCHU_PURPLE)
{
if (mEquipItem == LV1_SOUP) {
if (mEquipItem == fpcNm_ITEM_LV1_SOUP) {
dComIfGp_setItemLifeCount(8, 0);
} else if (mEquipItem == LV2_SOUP) {
} else if (mEquipItem == fpcNm_ITEM_LV2_SOUP) {
dComIfGp_setItemLifeCount(16, 0);
} else if (mEquipItem == LV3_SOUP) {
} else if (mEquipItem == fpcNm_ITEM_LV3_SOUP) {
dComIfGp_setItemLifeCount(32, 0);
} else if (mEquipItem == BEE_CHILD) {
} else if (mEquipItem == fpcNm_ITEM_BEE_CHILD) {
field_0x2fd3 = 3;
dComIfGp_setItemLifeCount(dComIfGp_getSelectItemNum(mSelectItemId), 0);
} else if (mEquipItem == RED_BOTTLE || mEquipItem == CHUCHU_RED ||
mEquipItem == RED_BOTTLE_2)
} else if (mEquipItem == fpcNm_ITEM_RED_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_RED ||
mEquipItem == fpcNm_ITEM_RED_BOTTLE_2)
{
dComIfGp_setItemLifeCount(32, 0);
} else if (mEquipItem == MILK_BOTTLE || mEquipItem == HALF_MILK_BOTTLE) {
} else if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE || mEquipItem == fpcNm_ITEM_HALF_MILK_BOTTLE) {
dComIfGp_setItemLifeCount(12, 0);
} else if (mEquipItem == BLUE_BOTTLE || mEquipItem == CHUCHU_BLUE ||
mEquipItem == HOT_SPRING)
} else if (mEquipItem == fpcNm_ITEM_BLUE_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_BLUE ||
mEquipItem == fpcNm_ITEM_HOT_SPRING)
{
dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0);
} else if (mEquipItem == CHUCHU_RARE || mEquipItem == FAIRY_DROP) {
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) {
dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0);
}
}
@@ -205,7 +205,7 @@ int daAlink_c::commonBottleDrink(int param_0) {
if (dComIfGp_getItemNowLife() == dComIfGs_getLife()) {
mpHookTipModel = NULL;
if (mEquipItem == MILK_BOTTLE) {
if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE) {
if (param_0) {
setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_END)->m_upperID, UPPER_2,
&daAlinkHIO_bottle_c0::m.mEndDrinkAnm);
@@ -217,13 +217,13 @@ int daAlink_c::commonBottleDrink(int param_0) {
field_0x072c->setFrame(1.0f);
if (mDemo.getDemoType() == 5) {
dComIfGs_setEquipBottleItemIn(mSelectItemId, HALF_MILK_BOTTLE);
dComIfGs_setEquipBottleItemIn(mSelectItemId, fpcNm_ITEM_HALF_MILK_BOTTLE);
}
} else if (mProcVar2.field_0x300c == 0) {
mProcVar2.field_0x300c = 1;
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0720);
} else if (simpleAnmPlay(field_0x0720)) {
if (mEquipItem == UGLY_SOUP) {
if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) {
if (dComIfGs_getLife() <= 2) {
mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge();
} else if (dComIfGs_getLife() <= 4) {
@@ -236,7 +236,7 @@ int daAlink_c::commonBottleDrink(int param_0) {
} else {
mItemVar0.mBottleItemHealAmount = 4;
}
} else if (mEquipItem == CHUCHU_PURPLE) {
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_PURPLE) {
f32 rnd = cM_rndF(6.0f);
if (rnd < 1.0f) {
@@ -251,11 +251,11 @@ int daAlink_c::commonBottleDrink(int param_0) {
} else {
mItemVar0.mBottleItemHealAmount = 4;
}
} else if (mEquipItem == CHUCHU_BLACK) {
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_BLACK) {
mItemVar0.mBottleItemHealAmount = -4;
}
if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == BEE_CHILD) {
if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == fpcNm_ITEM_BEE_CHILD) {
if (param_0) {
setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_NASTY)->m_upperID,
UPPER_2, &daAlinkHIO_bottle_c0::m.mDrinkNastyAnm);
@@ -278,7 +278,7 @@ int daAlink_c::commonBottleDrink(int param_0) {
dComIfGs_setEquipBottleItemEmpty(mSelectItemId);
}
if (mEquipItem == CHUCHU_RARE || mEquipItem == FAIRY_DROP) {
if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) {
mSwordUpTimer = 510;
}
}
@@ -287,10 +287,10 @@ int daAlink_c::commonBottleDrink(int param_0) {
current_anm == getMainBckData(ANM_BOTTLE_DRINK_NASTY)->m_underID)
{
if (checkAnmEnd(frameCtrl_p)) {
if (mDemo.getDemoMode() == 0x2A) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) {
setSingleAnimeParam(ANM_PICK_UP, &daAlinkHIO_pickUp_c0::m.field_0x14);
} else {
allUnequip(mKeepItem == KANTERA);
allUnequip(mKeepItem == fpcNm_ITEM_KANTERA);
}
} else if (frameCtrl_p->checkPass(11.0f)) {
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0718);
@@ -321,9 +321,9 @@ int daAlink_c::commonBottleDrink(int param_0) {
} else if (frameCtrl_p->checkPass(9.0f)) {
returnKeepItemData();
}
} else if (mEquipItem == NO_ITEM || mEquipItem == KANTERA) {
} else if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == fpcNm_ITEM_KANTERA) {
resetUpperAnime(UPPER_2, 3.0f);
if (mEquipItem == NO_ITEM) {
if (mEquipItem == fpcNm_ITEM_NONE) {
returnKeepItemData();
}
@@ -368,7 +368,7 @@ fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) {
/* 8010F54C-8010F698 109E8C 014C+00 2/2 0/0 0/0 .text procBottleDrinkInit__9daAlink_cFUs
*/
int daAlink_c::procBottleDrinkInit(u16 i_itemNo) {
if (mDemo.getDemoMode() == 0x2A) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) {
if (mProcID == PROC_BOTTLE_DRINK) {
return 1;
}
@@ -431,12 +431,12 @@ int daAlink_c::procBottleOpenInit(u16 param_0) {
field_0x32cc = -1;
mProcVar0.field_0x3008 = 1;
if (mEquipItem == FAIRY) {
if (mEquipItem == fpcNm_ITEM_FAIRY) {
field_0x3194 = 3;
} else {
field_0x3194 = 2;
if (mEquipItem == WORM) {
if (mEquipItem == fpcNm_ITEM_WORM) {
field_0x32cc = fopAcM_create(PROC_NPC_WORM, 2, &current.pos, fopAcM_GetRoomNo(this),
NULL, NULL, -1);
mProcVar0.field_0x3008 = 0;
@@ -478,12 +478,12 @@ int daAlink_c::procBottleOpen() {
if (checkUnderMove0BckNoArc(ANM_BOTTLE_OPEN)) {
if (checkAnmEnd(frameCtrl_p)) {
if (mEquipItem == FAIRY) {
if (mEquipItem == fpcNm_ITEM_FAIRY) {
setSingleAnimeBaseMorf(ANM_BOTTLE_FAIRY, -1.0f);
} else {
setSingleAnimeParam(ANM_BOTTLE_POUR, &daAlinkHIO_bottle_c0::m.mPourAnm);
if (mEquipItem == WATER_BOTTLE) {
if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
if (mWaterY > mLeftHandPos.y) {
mProcVar3.field_0x300e = 0;
} else {
@@ -496,7 +496,7 @@ int daAlink_c::procBottleOpen() {
mProcVar2.field_0x300c = 1;
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x071c);
if (mEquipItem == FAIRY) {
if (mEquipItem == fpcNm_ITEM_FAIRY) {
cXyz spC;
mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTop, &spC);
@@ -518,7 +518,7 @@ int daAlink_c::procBottleOpen() {
mProcVar2.field_0x300c = 2;
dComIfGs_setEquipBottleItemEmpty(mSelectItemId);
if (mEquipItem == WATER_BOTTLE && mProcVar3.field_0x300e != 0) {
if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar3.field_0x300e != 0) {
seStartOnlyReverb(Z2SE_LK_SPRINKLE_WATER);
}
} else if (frameCtrl_p->getFrame() > 16.0f && frameCtrl_p->getFrame() < 31.0f) {
@@ -550,11 +550,11 @@ int daAlink_c::procBottleOpen() {
* procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci */
int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
fopAc_ac_c* var_r31 = param_0;
if (var_r31 != NULL && mEquipItem != KANTERA) {
if (var_r31 != NULL && mEquipItem != fpcNm_ITEM_KANTERA) {
return procPreActionUnequipInit(PROC_BOTTLE_SWING, NULL);
}
if (var_r31 == NULL && getReadyItem() != EMPTY_BOTTLE) {
if (var_r31 == NULL && getReadyItem() != fpcNm_ITEM_EMPTY_BOTTLE) {
return checkWaitAction();
}
@@ -591,11 +591,11 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
}
if (temp_r30 == PROC_OBJ_OILTUBO || temp_r30 == PROC_TAG_SSDRINK ||
temp_r30 == PROC_TAG_BTLITM || mEquipItem == KANTERA)
temp_r30 == PROC_TAG_BTLITM || mEquipItem == fpcNm_ITEM_KANTERA)
{
setSingleAnimeParam(ANM_BOTTLE_SCOOP, &daAlinkHIO_bottle_c0::m.mScoopAnm);
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
onNoResetFlg2(FLG2_UNK_10000000);
JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x31c4);
@@ -659,25 +659,25 @@ int daAlink_c::procBottleSwing() {
mProcVar2.field_0x300c = 1;
offModeFlg(4);
if (mEquipItem != KANTERA) {
if (mEquipItem != fpcNm_ITEM_KANTERA) {
u16 bottle_item = dComIfGp_event_getPreItemNo();
if (bottle_item == WATER_BOTTLE &&
if (bottle_item == fpcNm_ITEM_WATER_BOTTLE &&
getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == PROC_Obj_Onsen)
{
bottle_item = HOT_SPRING;
bottle_item = fpcNm_ITEM_HOT_SPRING;
}
dComIfGs_setEquipBottleItemIn(mSelectItemId, bottle_item);
if (bottle_item == BEE_CHILD) {
if (bottle_item == fpcNm_ITEM_BEE_CHILD) {
dComIfGp_setSelectItemNum(mSelectItemId, dComIfGs_getBottleMax());
} else if (bottle_item == WATER_BOTTLE) {
} else if (bottle_item == fpcNm_ITEM_WATER_BOTTLE) {
seStartOnlyReverb(Z2SE_LK_SCOOP_WATER);
} else if (checkOilBottleItem(bottle_item)) {
seStartOnlyReverb(Z2SE_AL_SCOOP_OIL);
} else if (bottle_item == LV1_SOUP || bottle_item == LV2_SOUP ||
bottle_item == LV3_SOUP)
} else if (bottle_item == fpcNm_ITEM_LV1_SOUP || bottle_item == fpcNm_ITEM_LV2_SOUP ||
bottle_item == fpcNm_ITEM_LV3_SOUP)
{
seStartOnlyReverb(Z2SE_AL_SCOOP_SOUP);
}
@@ -689,12 +689,12 @@ int daAlink_c::procBottleSwing() {
mDemo.setSpecialDemoType();
}
} else if (frameCtrl_p->getFrame() <= field_0x347c) {
if (getReadyItem() == EMPTY_BOTTLE &&
if (getReadyItem() == fpcNm_ITEM_EMPTY_BOTTLE &&
(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 == KANTERA) {
} else if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (field_0x280c.getActor() != NULL) {
fopAcM_orderCatchEvent(this, field_0x280c.getActor(), 0, 0);
}
@@ -723,14 +723,14 @@ int daAlink_c::procBottleGetInit(int param_0) {
commonProcInit(PROC_BOTTLE_GET);
int var_r30;
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
setSingleAnime(ANM_BOTTLE_GET, daAlinkHIO_bottle_c0::m.mGetAnm.mSpeed, 40.0f,
daAlinkHIO_bottle_c0::m.mGetAnm.mEndFrame,
daAlinkHIO_bottle_c0::m.mGetAnm.mInterpolation);
field_0x2f93 = 0xFE;
if (proc_pickup) {
execItemGet(KANTERA);
execItemGet(fpcNm_ITEM_KANTERA);
var_r30 = 0xF8;
dComIfGp_setItemOilCount(-dComIfGs_getMaxOil());
} else {
@@ -754,26 +754,26 @@ int daAlink_c::procBottleGetInit(int param_0) {
field_0x3194 = 0;
field_0x32cc = var_r30 + 0x65;
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
field_0x3194 = 12;
}
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
resetBasAnime();
}
u32 id = fopAcM_GetID(this);
dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0);
if (mEquipItem == FAIRY_DROP || mEquipItem == CHUCHU_RARE || mEquipItem == WORM) {
if (mEquipItem == fpcNm_ITEM_FAIRY_DROP || mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_WORM) {
setFaceBasicTexture(FTANM_UNK_48);
setFaceBasicBck(0x143);
} else if (mEquipItem == UGLY_SOUP) {
} else if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) {
setFaceBasicBck(0x146);
}
// event flag 0x4A40: Ordon Day 1 completed
if (mEquipItem == BEE_CHILD && dComIfGs_isEventBit(0x4A40)) {
if (mEquipItem == fpcNm_ITEM_BEE_CHILD && dComIfGs_isEventBit(0x4A40)) {
dComIfGs_onEventBit(0x4C80); // event flag 0x4C80: Collected Bee Larva on Ordon Day 2
}
@@ -788,7 +788,7 @@ int daAlink_c::procBottleGet() {
if (frameCtrl->checkAnmEnd() && checkEndMessage(field_0x32cc)) {
resetFairyEffect();
if (mEquipItem != KANTERA) {
if (mEquipItem != fpcNm_ITEM_KANTERA) {
deleteEquipItem(FALSE, FALSE);
}
src/d/actor/d_a_alink_bow.inc
+22 -22
View File
@@ -11,7 +11,7 @@
/* 800DE64C-800DE740 0D8F8C 00F4+00 1/1 0/0 2/2 .text getArrowFlyData__9daAlink_cCFPfPfi
*/
void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, int i_forceCharge) const {
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
*o_distance = daAlinkHIO_bow_c0::m.mSlingshotDistance;
*o_speed = daAlinkHIO_bow_c0::m.mSlingshotSpeed;
} else if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
@@ -56,7 +56,7 @@ f32 daAlink_c::getArrowIncAtMax() const {
/* 800DE780-800DE7D4 0D90C0 0054+00 10/10 0/0 0/0 .text checkBowAndSlingItem__9daAlink_cFi */
BOOL daAlink_c::checkBowAndSlingItem(int i_itemNo) {
return checkBowItem(i_itemNo) || i_itemNo == PACHINKO;
return checkBowItem(i_itemNo) || i_itemNo == fpcNm_ITEM_PACHINKO;
}
/* 800DE7D4-800DE884 0D9114 00B0+00 1/1 0/0 0/0 .text setSlingModel__9daAlink_cFv */
@@ -75,7 +75,7 @@ void daAlink_c::setSlingModel() {
/* 800DE884-800DE990 0D91C4 010C+00 0/0 1/1 1/1 .text checkBowCameraArrowPosP__9daAlink_cFPsPs */
cXyz* daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) {
if (!checkBowAnime() || mEquipItem == PACHINKO) {
if (!checkBowAnime() || mEquipItem == fpcNm_ITEM_PACHINKO) {
return NULL;
}
@@ -152,7 +152,7 @@ void daAlink_c::deleteArrow() {
/* 800DEB8C-800DEBC8 0D94CC 003C+00 6/6 0/0 0/0 .text setBowOrSlingStatus__9daAlink_cFv
*/
void daAlink_c::setBowOrSlingStatus() {
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
dComIfGp_setPlayerStatus0(0, 0x40);
} else {
dComIfGp_setPlayerStatus0(0, 0x1000);
@@ -161,10 +161,10 @@ void daAlink_c::setBowOrSlingStatus() {
/* 800DEBC8-800DED88 0D9508 01C0+00 1/1 0/0 0/0 .text changeArrowType__9daAlink_cFv */
void daAlink_c::changeArrowType() {
if (checkCanoeSlider() || (mEquipItem == BOW && field_0x301e == 0) ||
(mEquipItem == BOMB_ARROW && field_0x301e == 0 &&
if (checkCanoeSlider() || (mEquipItem == fpcNm_ITEM_BOW && field_0x301e == 0) ||
(mEquipItem == fpcNm_ITEM_BOMB_ARROW && field_0x301e == 0 &&
dComIfGp_getSelectItemNum(mSelectItemId) == 0) ||
(mEquipItem == HAWK_ARROW && checkAttentionLock()))
(mEquipItem == fpcNm_ITEM_HAWK_ARROW && checkAttentionLock()))
{
return;
}
@@ -172,7 +172,7 @@ void daAlink_c::changeArrowType() {
setItemActionButtonStatus(0x11);
if (arrowChangeTrigger()) {
if (mEquipItem == HAWK_ARROW) {
if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
dComIfGp_clearPlayerStatus0(0, 0x200000);
seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF);
@@ -217,7 +217,7 @@ BOOL daAlink_c::cancelBowMove() {
/* 800DEEDC-800DEFB8 0D981C 00DC+00 3/3 0/0 0/0 .text setBowReadyAnime__9daAlink_cFv */
void daAlink_c::setBowReadyAnime() {
if (!checkBowAnime()) {
if (mEquipItem == BOMB_ARROW) {
if (mEquipItem == fpcNm_ITEM_BOMB_ARROW) {
if (dComIfGp_getSelectItemNum(mSelectItemId) != 0) {
field_0x301e = 1;
} else {
@@ -239,7 +239,7 @@ void daAlink_c::setBowReadyAnime() {
field_0x2f97 = 5;
field_0x2f96 = 4;
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
changeItemBck(0x1F1, -1.0f);
} else {
changeItemBck(0x43, -1.0f);
@@ -252,7 +252,7 @@ void daAlink_c::setBowReloadAnime() {
setFacePriTexture(FTANM_UNK_8);
setFacePriBck(0xE5);
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
changeItemBck(0x1F0, daAlinkHIO_bow_c0::m.mLoadAnm.mStartFrame);
field_0x2f97 = 5;
seStartOnlyReverb(Z2SE_AL_PACHINKO_DRAW);
@@ -270,14 +270,14 @@ void daAlink_c::setBowReloadAnime() {
BOOL daAlink_c::checkUpperItemActionBow() {
daPy_frameCtrl_c* frameCtrl_p = &mUpperFrameCtrl[2];
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
mDoMtx_multVec(getLeftItemMatrix(), &slingLocalPos, &mHeldItemRootPos);
}
if (checkBowChargeWaitAnime()) {
daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor();
if (mEquipItem != PACHINKO) {
if (mEquipItem != fpcNm_ITEM_PACHINKO) {
if (field_0x301c > 0) {
field_0x301c--;
@@ -299,7 +299,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
field_0x2f96 = 0;
u16 var_r29;
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
var_r29 = 0x1F1;
if (dComIfGs_getPachinkoNum() != 0 &&
daArrow_c::makeSlingStone(this, &mHeldItemRootPos) != NULL)
@@ -314,7 +314,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
changeItemBck(var_r29, daAlinkHIO_bow_c0::m.mShootAnm.mStartFrame);
mItemVar0.field_0x3018 = 0;
} else if (mEquipItem == PACHINKO) {
} else if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (!itemButton()) {
dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f));
seStartOnlyReverb(Z2SE_AL_PACHINKO_SHOT);
@@ -364,7 +364,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
mItemVar0.field_0x3018 = 1;
resetFacePriAnime();
if (mEquipItem == BOW) {
if (mEquipItem == fpcNm_ITEM_BOW) {
field_0x301e = 0;
}
} else {
@@ -377,7 +377,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
setFacePriTexture(FTANM_UNK_9);
setFacePriBck(0xE6);
if (mEquipItem != PACHINKO) {
if (mEquipItem != fpcNm_ITEM_PACHINKO) {
changeItemBck(0x42, 0.0f);
dComIfGp_getVibration().StartQuake(1, 1, cXyz(0.0f, 1.0f, 0.0f));
onNoResetFlg3(FLG3_UNK_4);
@@ -398,12 +398,12 @@ BOOL daAlink_c::checkUpperItemActionBow() {
{
setBowReloadAnime();
if (mEquipItem == PACHINKO) {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
mItemVar0.field_0x3018 = 0;
} else {
makeArrow();
}
} else if (mEquipItem == HAWK_ARROW) {
} else if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
changeArrowType();
}
@@ -435,7 +435,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
}
}
if (checkBowWaitAnime() || (mEquipItem == PACHINKO && checkBowChargeWaitAnime())) {
if (checkBowWaitAnime() || (mEquipItem == fpcNm_ITEM_PACHINKO && checkBowChargeWaitAnime())) {
field_0x33dc += daAlinkHIO_bow_c0::m.mShootAnm.mSpeed;
} else {
field_0x33dc = mUpperFrameCtrl[2].getFrame();
@@ -474,7 +474,7 @@ int daAlink_c::checkNextActionBow() {
mItemMode = 0;
mItemVar0.field_0x3018 = 1;
if (mEquipItem == HAWK_ARROW) {
if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
var_r31 = true;
mFastShotTime = 0;
}
@@ -558,7 +558,7 @@ void daAlink_c::setBowHangAnime() {
void daAlink_c::setBowNormalAnime() {
if (checkBowItem(mEquipItem)) {
changeItemBck(0x59, -1.0f);
} else if (mEquipItem == PACHINKO) {
} else if (mEquipItem == fpcNm_ITEM_PACHINKO) {
changeItemBck(0x1F9, -1.0f);
}
}
src/d/actor/d_a_alink_canoe.inc
+21 -21
View File
@@ -91,9 +91,9 @@ void daAlink_c::initFishingRodHand() {
field_0x2f95 = 0x65;
mItemVar0.field_0x3018 = 1;
if (mEquipItem == JEWEL_WORM_ROD || mEquipItem == WORM_ROD) {
if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_WORM_ROD) {
mItemMode = 0x74;
} else if (mEquipItem == JEWEL_BEE_ROD || mEquipItem == BEE_ROD) {
} else if (mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD || mEquipItem == fpcNm_ITEM_BEE_ROD) {
mItemMode = 0x76;
} else {
mItemMode = 0xFF;
@@ -624,7 +624,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) {
var_f31 = 3.0f;
mProcVar0.field_0x3008 = 0;
if (mEquipItem == NO_ITEM || (mEquipItem != 0x10B && !checkFisingRodLure())) {
if (mEquipItem == fpcNm_ITEM_NONE || (mEquipItem != 0x10B && !checkFisingRodLure())) {
var_r27 = ANM_WAIT_SIT;
} else if (mProcVar5.field_0x3012 == 0) {
var_r27 = ANM_WAIT_CANOE_LEFT;
@@ -636,7 +636,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) {
setSyncCanoePos();
setSingleAnimeBaseMorf(var_r27, var_f31);
if (param_0 && mEquipItem != 0x10B && mEquipItem != NO_ITEM && !checkFisingRodLure()) {
if (param_0 && mEquipItem != 0x10B && mEquipItem != fpcNm_ITEM_NONE && !checkFisingRodLure()) {
allUnequip(0);
}
@@ -671,7 +671,7 @@ int daAlink_c::procCanoeWait() {
return procCanoePaddlePutInit(1);
}
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
allUnequip(0);
}
@@ -681,7 +681,7 @@ int daAlink_c::procCanoeWait() {
if (checkFisingRodLure()) {
procCanoeFishingWaitInit();
} else if (mEquipItem == NO_ITEM && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) {
} else if (mEquipItem == fpcNm_ITEM_NONE && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) {
field_0x2fde = 0xFF;
if (mThrowBoomerangAcKeep.getActor() != NULL || mProcVar1.field_0x300a != 0) {
@@ -695,7 +695,7 @@ int daAlink_c::procCanoeWait() {
procCanoePaddleGrabInit();
} else if (checkInputOnR() && mEquipItem == 0x10B) {
procCanoeRowInit(-1);
} else if (mEquipItem != NO_ITEM && mEquipItem != 0x10B) {
} else if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B) {
if (!checkUnderMove0BckNoArc(ANM_WAIT_SIT) && getNowAnmPackUnder(UNDER_0) != getNowAnmPackUpper(UPPER_0)) {
setSingleAnimeBase(ANM_WAIT_SIT);
} else if (checkInputOnR()) {
@@ -969,7 +969,7 @@ int daAlink_c::procCanoePaddleShift() {
int daAlink_c::procCanoePaddlePutInit(int param_0) {
if (checkCanoeSlider() && mEquipItem == 0x10B) {
if (checkEquipAnime() && checkBowItem(field_0x2fde)) {
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
field_0x2f93 = 0xFE;
field_0x2f92 = 0xFE;
return procCanoeWaitInit(0);
@@ -1037,7 +1037,7 @@ int daAlink_c::procCanoePaddlePut() {
mEquipItem = 0x105;
field_0x2f93 = 5;
} else {
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
field_0x2f93 = 0xFE;
}
@@ -1113,7 +1113,7 @@ int daAlink_c::procCanoePaddleGrab() {
int daAlink_c::procCanoeRodGrabInit() {
commonProcInit(PROC_CANOE_ROD_GRAB);
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
allUnequip(0);
mProcVar0.field_0x3008 = 1;
} else {
@@ -1738,10 +1738,10 @@ int daAlink_c::procFishingCast() {
mItemMode = 0xFF;
dComIfGs_setBaitItem(0xFF);
if (mEquipItem == JEWEL_WORM_ROD || mEquipItem == JEWEL_BEE_ROD) {
mEquipItem = JEWEL_ROD;
if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD) {
mEquipItem = fpcNm_ITEM_JEWEL_ROD;
} else {
mEquipItem = FISHING_ROD_1;
mEquipItem = fpcNm_ITEM_FISHING_ROD_1;
}
}
@@ -1815,15 +1815,15 @@ int daAlink_c::procFishingFood() {
mProcVar2.field_0x300c = 1;
u32 temp_r3 = dComIfGp_getSelectItem(mProcVar3.field_0x300e);
if (temp_r3 == WORM || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) {
if (temp_r3 == fpcNm_ITEM_WORM || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) {
dComIfGs_setEquipBottleItemEmpty(mProcVar3.field_0x300e);
} else {
dComIfGp_addSelectItemNum(mProcVar3.field_0x300e, -1);
}
if (mItemMode != NO_ITEM) {
if (mItemMode != fpcNm_ITEM_NONE) {
dComIfGs_setEquipBottleItemIn(mProcVar3.field_0x300e, mItemMode);
if (mItemMode == BEE_CHILD) {
if (mItemMode == fpcNm_ITEM_BEE_CHILD) {
dComIfGp_setSelectItemNum(mProcVar3.field_0x300e, 1);
}
}
@@ -1831,16 +1831,16 @@ int daAlink_c::procFishingFood() {
mItemMode = temp_r3;
BOOL temp_r28 = checkFisingRodJewl();
if (temp_r3 == WORM) {
if (temp_r3 == fpcNm_ITEM_WORM) {
if (temp_r28) {
mEquipItem = JEWEL_WORM_ROD;
mEquipItem = fpcNm_ITEM_JEWEL_WORM_ROD;
} else {
mEquipItem = WORM_ROD;
mEquipItem = fpcNm_ITEM_WORM_ROD;
}
} else if (temp_r28) {
mEquipItem = JEWEL_BEE_ROD;
mEquipItem = fpcNm_ITEM_JEWEL_BEE_ROD;
} else {
mEquipItem = BEE_ROD;
mEquipItem = fpcNm_ITEM_BEE_ROD;
}
dComIfGs_setBaitItem(temp_r3);
src/d/actor/d_a_alink_copyrod.inc
+3 -3
View File
@@ -201,7 +201,7 @@ int daAlink_c::returnCopyRod() {
offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER);
int var_r31;
if (mEquipItem == COPY_ROD) {
if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
mItemAcKeep = mCopyRodAcKeep;
onNoResetFlg0(FLG0_UNK_20);
var_r31 = 1;
@@ -444,9 +444,9 @@ int daAlink_c::procCopyRodReviveInit() {
}
if (mDemo.getParam0() == 0) {
if (mEquipItem != COPY_ROD) {
if (mEquipItem != fpcNm_ITEM_COPY_ROD) {
deleteEquipItem(0, 0);
mEquipItem = COPY_ROD;
mEquipItem = fpcNm_ITEM_COPY_ROD;
setCopyRodModel();
}
field_0x0724->setFrame(0.0f);
src/d/actor/d_a_alink_crawl.inc
+1 -1
View File
@@ -467,7 +467,7 @@ void daAlink_c::setCrawlAutoMoveAimPos() {
/* 800F9210-800F9384 0F3B50 0174+00 2/2 0/0 0/0 .text procCrawlStartInit__9daAlink_cFv */
int daAlink_c::procCrawlStartInit() {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_CRAWL_START, NULL);
}
src/d/actor/d_a_alink_cut.inc
+7 -7
View File
@@ -117,7 +117,7 @@ bool daAlink_c::checkCutFastReady() {
fopAc_ac_c* target_p = mAttention->LockonTarget(0);
if (mEquipItem == NO_ITEM && (dComIfGs_isEventBit(0x2A80) || checkNoResetFlg3(FLG3_UNK_80)))
if (mEquipItem == fpcNm_ITEM_NONE && (dComIfGs_isEventBit(0x2A80) || checkNoResetFlg3(FLG3_UNK_80)))
{
if (checkModeFlg(1) && !checkRideOn() && i_checkSwordGet() && checkModeFlg(4) &&
!checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p))
@@ -140,7 +140,7 @@ bool daAlink_c::checkCutFastReady() {
/* 800D1268-800D1310 0CBBA8 00A8+00 9/9 0/0 0/0 .text setSwordModel__9daAlink_cFv */
void daAlink_c::setSwordModel() {
field_0x2fde = 0xFF;
mEquipItem = EQUIP_SWORD;
mEquipItem = 0x103;
mDoAud_bgmSetSwordUsing(1);
field_0x2f94 = 0;
@@ -192,7 +192,7 @@ void daAlink_c::resetCombo(int param_0) {
/* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text checkComboCnt__9daAlink_cFv */
void daAlink_c::checkComboCnt() {
if ((mEquipItem == EQUIP_SWORD && mComboCutCount == 2) &&
if ((mEquipItem == 0x103 && mComboCutCount == 2) &&
(checkAttentionLock() &&
(mAtCps[0].ChkAtHit() || mAtCps[1].ChkAtHit() || mAtCps[2].ChkAtHit())))
{
@@ -227,7 +227,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 == WATER_BOTTLE) {
} else if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
mtrl = dCcD_MTRL_UNK_6;
} else {
mtrl = dCcD_MTRL_NONE;
@@ -366,11 +366,11 @@ BOOL daAlink_c::checkCutReverseAt(dCcD_GObjInf* param_0) {
/* 800D19C8-800D1E1C 0CC308 0454+00 5/5 0/0 0/0 .text
* changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM */
BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) {
if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) {
if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != fpcNm_ITEM_COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) {
return procCutReverseInit(param_0);
}
if (checkNoResetFlg0(FLG0_UNK_40) || mEquipItem == COPY_ROD) {
if (checkNoResetFlg0(FLG0_UNK_40) || mEquipItem == fpcNm_ITEM_COPY_ROD) {
cXyz sp28;
Vec sp1C;
@@ -501,7 +501,7 @@ void daAlink_c::setCutDash(int param_0, int param_1) {
/* 800D20B4-800D20FC 0CC9F4 0048+00 4/4 0/0 0/0 .text checkForceSwordSwing__9daAlink_cFv
*/
BOOL daAlink_c::checkForceSwordSwing() {
return mEquipItem == EQUIP_SWORD && swordSwingTrigger();
return mEquipItem == 0x103 && swordSwingTrigger();
}
/* 800D20FC-800D2188 0CCA3C 008C+00 7/7 0/0 0/0 .text setComboReserb__9daAlink_cFv */
src/d/actor/d_a_alink_damage.inc
+2 -2
View File
@@ -649,7 +649,7 @@ BOOL daAlink_c::checkDamageAction() {
return procHorseHangInit(var_r29, 0);
}
} else if (at_spl == 8 || checkModeFlg(0x70C52)) {
if (!checkModeFlg(0x400) && mEquipItem != IRONBALL) {
if (!checkModeFlg(0x400) && mEquipItem != fpcNm_ITEM_IRONBALL) {
setSmallGuard(var_r29);
}
} else {
@@ -1670,7 +1670,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
daAlink_ANM var_r29;
daAlink_WANM var_r28;
if ((mLinkAcch.i_ChkGroundHit() && !temp_r27) || checkMagneBootsOn()) {
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
setIronBallWaitUpperAnime(1);
}
var_r29 = ANM_ELEC_STUN_GND;
src/d/actor/d_a_alink_demo.inc
+142 -132
View File
@@ -45,8 +45,8 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
if (param_2 != 0 && checkDungeon() &&
i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17 &&
i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x18 &&
(checkItemGet(TKS_LETTER, 1) ||
(checkItemGet(DUNGEON_BACK, 1) && !checkLv7DungeonShop())) &&
(checkItemGet(fpcNm_ITEM_TKS_LETTER, 1) ||
(checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) && !checkLv7DungeonShop())) &&
dComIfGs_isDungeonItemWarp())
{
if (!dComIfGs_isStageBossEnemy()) {
@@ -87,11 +87,11 @@ int daAlink_c::checkDemoAction() {
JUT_ASSERT(155,
(demoMode < daPy_demo_c::DEMO_LAST_e) || (demoMode == daPy_demo_c::DEMO_NEW_ANM0_e));
if (demoMode != 6 && demoMode != 8) {
if (demoMode != daPy_demo_c::DEMO_UNK_6_e && demoMode != daPy_demo_c::DEMO_UNK_8_e) {
offNoResetFlg0(FLG0_UNK_400);
}
if (demoMode != 0x33 && mSpecialMode == 1) {
if (demoMode != daPy_demo_c::DEMO_SUMOU_SHIKO_e && mSpecialMode == 1) {
return procSumouReadyInit();
}
@@ -99,13 +99,28 @@ int daAlink_c::checkDemoAction() {
return 0;
}
if (!checkModeFlg(0x400) && demoMode != daPy_demo_c::DEMO_NEW_ANM0_e && demoMode != 0x46 &&
demoMode != 0x47 && demoMode != 0x39 && demoMode != 0x3A && demoMode != 9 &&
demoMode != 0x11 && demoMode != 0x18 && demoMode != 7 && demoMode != 0x13 &&
demoMode != 4 && demoMode != 0x38 && demoMode != 0x45 && demoMode != 0xA &&
demoMode != 0x2D && demoMode != 0x23 && demoMode != 0x43 && demoMode != 0x34 &&
(demoMode != 0xB || !checkModeFlg(0x10040)) &&
!dComIfGp_checkPlayerStatus0(0, 0x100000) && !checkFlyAtnWait() &&
if (!checkModeFlg(0x400) &&
demoMode != daPy_demo_c::DEMO_NEW_ANM0_e &&
demoMode != daPy_demo_c::DEMO_METAMORPHOSE_ONLY_UNK1_e &&
demoMode != daPy_demo_c::DEMO_METAMORPHOSE_ONLY_UNK2_e &&
demoMode != daPy_demo_c::DEMO_METAMORPHOSE_UNK1_e &&
demoMode != daPy_demo_c::DEMO_METAMORPHOSE_UNK2_e &&
demoMode != daPy_demo_c::DEMO_UNK_9_e &&
demoMode != daPy_demo_c::DEMO_UNK_17_e &&
demoMode != daPy_demo_c::DEMO_UNK_24_e &&
demoMode != daPy_demo_c::DEMO_UNK_7_e &&
demoMode != daPy_demo_c::DEMO_MONKEY_MOVE_e &&
demoMode != daPy_demo_c::DEMO_UNK_4_e &&
demoMode != daPy_demo_c::DEMO_WOLF_CARGO_CARRY_e &&
demoMode != daPy_demo_c::DEMO_ZORA_MOVE_e &&
demoMode != daPy_demo_c::DEMO_OPEN_TREASURE_e &&
demoMode != daPy_demo_c::DEMO_UNK_45_e &&
demoMode != daPy_demo_c::DEMO_DOOR_OPEN_e &&
demoMode != daPy_demo_c::DEMO_FM_CHAIN_STRONG_PULL_e &&
demoMode != daPy_demo_c::DEMO_FOG_DEAD_e &&
(demoMode != daPy_demo_c::DEMO_GET_ITEM_e || !checkModeFlg(0x10040)) &&
!dComIfGp_checkPlayerStatus0(0, 0x100000) &&
!checkFlyAtnWait() &&
((!mLinkAcch.ChkGroundHit() && !checkMagneBootsOn()) || checkModeFlg(0x70C52)))
{
return 0;
@@ -130,7 +145,7 @@ int daAlink_c::checkDemoAction() {
return (this->*m_demoInitTable[demoMode])();
}
if (demoMode == 6 || demoMode == 8) {
if (demoMode == daPy_demo_c::DEMO_UNK_6_e || demoMode == daPy_demo_c::DEMO_UNK_8_e) {
if (mDemo.getParam1() != 1 && !checkNoResetFlg0(FLG0_UNK_400)) {
seStartSystem(Z2SE_SY_TALK_START);
onNoResetFlg0(FLG0_UNK_400);
@@ -143,8 +158,8 @@ int daAlink_c::checkDemoAction() {
if (checkModeFlg(0x4000000) || checkModeFlg(0x40000) || checkHorseRide() ||
checkBoarRide() || checkCanoeRide())
{
if (demoMode == 6 && (checkHorseRide() || checkBoarRide())) {
if (mEquipItem != NO_ITEM && mEquipItem != KANTERA && !checkEquipAnime()) {
if (demoMode == daPy_demo_c::DEMO_UNK_6_e && (checkHorseRide() || checkBoarRide())) {
if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != fpcNm_ITEM_KANTERA && !checkEquipAnime()) {
allUnequip(1);
}
}
@@ -176,7 +191,7 @@ int daAlink_c::checkDemoAction() {
}
return procCoTalkInit();
} else if (demoMode == 4) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_4_e) {
int var_r28;
if (checkWolf()) {
var_r28 = procWolfWaitInit();
@@ -198,7 +213,7 @@ int daAlink_c::checkDemoAction() {
} else if (mDemo.getParam0() == 4) {
if (!checkFishingRodItem(mEquipItem)) {
deleteEquipItem(FALSE, TRUE);
mEquipItem = FISHING_ROD_1;
mEquipItem = fpcNm_ITEM_FISHING_ROD_1;
setGroundFishingRodActor();
}
} else if (mDemo.getParam0() == 3) {
@@ -237,7 +252,7 @@ int daAlink_c::checkDemoAction() {
field_0x2060->initOldFrameMorf(0.0f, 0, field_0x30c6);
}
return var_r28;
} else if (demoMode == 9) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_9_e) {
onNoResetFlg0(FLG0_UNK_100000);
if (mProcID == PROC_LARGE_DAMAGE_UP || mProcID == PROC_WOLF_LARGE_DAMAGE_UP ||
mProcID == PROC_LARGE_DAMAGE_WALL)
@@ -251,7 +266,7 @@ int daAlink_c::checkDemoAction() {
}
return procCoLargeDamageInit(-2, 1, 0, 0, NULL, 0);
} else if (demoMode == 0x24) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_36_e) {
onNoResetFlg0(FLG0_UNK_100000);
int prm0 = mDemo.getParam0();
if (mProcID == PROC_CUT_NORMAL || mProcID == PROC_CUT_FINISH || mProcID == PROC_CUT_TURN) {
@@ -267,7 +282,7 @@ int daAlink_c::checkDemoAction() {
} else {
return procCutTurnInit(1, 1);
}
} else if (demoMode == 0x52) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_82_e) {
onNoResetFlg0(FLG0_UNK_100000);
if (mProcID == PROC_TURN_MOVE || mProcID == PROC_CUT_FINISH_JUMP_UP ||
mProcID == PROC_CUT_FINISH_JUMP_UP_LAND)
@@ -276,7 +291,7 @@ int daAlink_c::checkDemoAction() {
}
return procTurnMoveInit(2);
} else if (demoMode == 0x54) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_84_e) {
onNoResetFlg0(FLG0_UNK_100000);
if (mProcID != PROC_CUT_FINISH) {
onNoResetFlg0(FLG0_UNK_1000000);
@@ -284,7 +299,7 @@ int daAlink_c::checkDemoAction() {
}
return 1;
} else if (demoMode == 0x2B) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_43_e) {
onNoResetFlg0(FLG0_UNK_100000);
int prm0 = mDemo.getParam0();
@@ -297,7 +312,7 @@ int daAlink_c::checkDemoAction() {
} else {
return procWolfWaitAttackInit(prm0);
}
} else if (demoMode == 0x1B) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_27_e) {
onNoResetFlg0(FLG0_UNK_100000);
if (mDemo.getDemoType() == 1) {
@@ -307,29 +322,29 @@ int daAlink_c::checkDemoAction() {
} else {
return commonLargeDamageUpInit(-3, 1, 0, 0);
}
} else if (demoMode == 0xF) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_15_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procWolfSitInit(1);
} else if (demoMode == 0x15) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_21_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procWolfHowlInit(0);
} else if (demoMode == 0x16) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_22_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procWolfHowlInit(1);
} else if (demoMode == 0x2D) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_45_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procCoWarpInit(mDemo.getParam0(), mDemo.getParam1());
} else if (demoMode == 0x18) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_24_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procAutoJumpInit(1);
} else if (demoMode == 0x5B) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_91_e) {
if (mProcID == PROC_CUT_TURN_MOVE || mProcID == PROC_CUT_TURN_CHARGE) {
return 1;
}
onNoResetFlg0(FLG0_UNK_100000);
return procCutTurnChargeInit();
} else if (demoMode == 0x5E) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_94_e) {
if (mProcID == PROC_WOLF_SERVICE_WAIT) {
return 0;
}
@@ -340,17 +355,17 @@ int daAlink_c::checkDemoAction() {
onNoResetFlg0(FLG0_UNK_100000);
return procWolfServiceWaitInit(0);
} else if (demoMode == 0x5C) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_92_e) {
if (mProcID == PROC_CUT_LARGE_JUMP_CHARGE || mProcID == PROC_CUT_TURN_MOVE) {
return 1;
}
onNoResetFlg0(FLG0_UNK_100000);
return procCutLargeJumpChargeInit();
} else if (demoMode == 0x49) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_73_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procSideRollInit(mDemo.getParam0() ? 3 : 2);
} else if (demoMode == 0x10) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_16_e) {
onNoResetFlg0(FLG0_UNK_100000);
if (checkWolf()) {
if (mProcID == PROC_WOLF_BACKJUMP_LAND || mProcID == PROC_WOLF_SIDESTEP_LAND ||
@@ -378,16 +393,16 @@ int daAlink_c::checkDemoAction() {
}
return procSideStepInit(mDemo.getParam0());
} else if (demoMode == 0x2C) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_44_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procWolfLieMoveInit(0);
} else if (demoMode == 0x11) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_17_e) {
onNoResetFlg0(FLG0_UNK_100000);
return commonFallInit(1);
} else if (demoMode == 0x2A) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_42_e) {
onNoResetFlg0(FLG0_UNK_100000);
return procBottleDrinkInit(mDemo.getParam0());
} else if (demoMode == 0x1F) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_31_e) {
onNoResetFlg0(FLG0_UNK_100000);
if (!checkModeFlg(0x4070C52) &&
(checkUpperReadyThrowAnime() || field_0x2f8c == 2 || field_0x2f8c == 1 ||
@@ -399,7 +414,7 @@ int daAlink_c::checkDemoAction() {
dComIfGp_evmng_cutEnd(field_0x3184);
return 1;
} else if (demoMode == 7) {
} else if (demoMode == daPy_demo_c::DEMO_UNK_7_e) {
offNoResetFlg0(FLG0_UNK_100000);
if (checkUpperReadyThrowAnime() || checkGrabAnime()) {
resetUpperAnime(UPPER_2, -1.0f);
@@ -415,10 +430,10 @@ int daAlink_c::checkDemoAction() {
} else if ((checkNoResetFlg0(FLG0_UNK_100000) || checkUpperReadyThrowAnime() ||
checkModeFlg(0x400) || mProcID == PROC_SWIM_SUBJECTIVITY ||
mProcID == PROC_FISHING_CAST || mProcID == PROC_SUBJECTIVITY) &&
(demoMode == 1 || checkDemoMoveMode(demoMode) || demoMode == 0x17 ||
demoMode == 0x1F || demoMode == 0x12 ||
(demoMode == daPy_demo_c::DEMO_UNK_1_e || checkDemoMoveMode(demoMode) || demoMode == daPy_demo_c::DEMO_UNK_23_e ||
demoMode == daPy_demo_c::DEMO_UNK_31_e || demoMode == daPy_demo_c::DEMO_UNK_18_e ||
(checkSpinnerRide() &&
(demoMode == 0x1A || (demoMode == 0xE && mDemo.getParam0() == 0)))))
(demoMode == daPy_demo_c::DEMO_UNK_26_e || (demoMode == daPy_demo_c::DEMO_UNK_14_e && mDemo.getParam0() == 0)))))
{
offNoResetFlg0(FLG0_UNK_100000);
if (checkUpperReadyThrowAnime()) {
@@ -426,7 +441,7 @@ int daAlink_c::checkDemoAction() {
}
if (checkReinRide()) {
if (mDemo.getDemoMode() == 0x17 && !checkEquipAnime() && mEquipItem != 0x103 &&
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e && !checkEquipAnime() && mEquipItem != 0x103 &&
(mDemo.getParam1() == 2 || mDemo.getParam1() == 3))
{
swordEquip(0);
@@ -467,13 +482,13 @@ int daAlink_c::checkDemoAction() {
/* 80116E60-80116E9C 1117A0 003C+00 4/4 0/0 0/0 .text checkDemoMoveMode__9daAlink_cCFUl
*/
bool daAlink_c::checkDemoMoveMode(u32 i_mode) const {
return i_mode == 2 || i_mode == 3 || i_mode == 0x26;
return i_mode == daPy_demo_c::DEMO_UNK_2_e || i_mode == daPy_demo_c::DEMO_UNK_3_e || i_mode == daPy_demo_c::DEMO_UNK_38_e;
}
/* 80116E9C-80117064 1117DC 01C8+00 1/1 0/0 0/0 .text setDemoMoveData__9daAlink_cFPUlPC4cXyz */
void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) {
void daAlink_c::setDemoMoveData(u32* o_mode, cXyz const* i_goal) {
cXyz sp20;
sp20 = *param_1 - current.pos;
sp20 = *i_goal - current.pos;
f32 temp_f30;
f32 temp_f29;
@@ -492,15 +507,15 @@ void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) {
f32 dist_to_pos = sp20.abs2XZ();
if (dist_to_pos < var_f27 * 25.0f) {
*param_0 = 1;
*o_mode = daPy_demo_c::DEMO_UNK_1_e;
if (!checkModeFlg(0x2)) {
mNormalSpeed = 0.0f;
}
} else if (dist_to_pos < temp_f30 || (dist_to_pos < temp_f28 && checkZeroSpeedF())) {
*param_0 = 1;
} else if ((*param_0 == 2 && dist_to_pos < temp_f29) || dist_to_pos < temp_f28) {
*param_0 = 2;
*o_mode = daPy_demo_c::DEMO_UNK_1_e;
} else if ((*o_mode == daPy_demo_c::DEMO_UNK_2_e && dist_to_pos < temp_f29) || dist_to_pos < temp_f28) {
*o_mode = daPy_demo_c::DEMO_UNK_2_e;
mDemo.setStick(0.35f);
} else if (mDemo.getDemoType() == 3) {
mDemo.setStick(1.0f);
@@ -574,7 +589,7 @@ void daAlink_c::setDemoData() {
dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
cXyz* pos_p = NULL;
s16 angle;
u32 demo_mode = 1;
u32 demo_mode = daPy_demo_c::DEMO_UNK_1_e;
int* prm0_p = NULL;
int* prm1_p = NULL;
@@ -606,11 +621,11 @@ void daAlink_c::setDemoData() {
if (mDemo.getDemoType() != 1) {
mDemo.setToolDemoType();
mDemo.setDemoMode(1);
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK_1_e);
freeGrabItem();
if (dComIfGp_evmng_startCheck("R22-opening")) {
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
deleteEquipItem(FALSE, FALSE);
}
} else {
@@ -661,8 +676,8 @@ void daAlink_c::setDemoData() {
mDemo.setSystemDemoType();
var_r28 = TRUE;
if (mDemo.getDemoMode() == 0) {
demo_mode = 0x41;
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_0_e) {
demo_mode = daPy_demo_c::DEMO_UNK_65_e;
}
}
@@ -677,15 +692,15 @@ void daAlink_c::setDemoData() {
// demo_mode
demo_mode = ((cut_name[0] - '0') * 100) + ((cut_name[1] - '0') * 10) +
(cut_name[2] - '0');
if (mDemo.getDemoType() != 4 && (demo_mode == 1 || demo_mode == 0x17) &&
if (mDemo.getDemoType() != 4 && (demo_mode == daPy_demo_c::DEMO_UNK_1_e || demo_mode == daPy_demo_c::DEMO_UNK_23_e) &&
mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52))
{
mNormalSpeed = 0.0f;
speedF = 0.0f;
}
if (demo_mode == 0x32 && !daMidna_c::checkMidnaRealBody()) {
demo_mode = 1;
if (demo_mode == daPy_demo_c::DEMO_WOLF_MIDNA_RIDE_SHOCK_e && !daMidna_c::checkMidnaRealBody()) {
demo_mode = daPy_demo_c::DEMO_UNK_1_e;
}
pos_p = dComIfGp_evmng_getMyXyzP(field_0x3184, "pos");
@@ -696,7 +711,7 @@ void daAlink_c::setDemoData() {
int* angle_p = dComIfGp_evmng_getMyIntegerP(field_0x3184, "angle");
if (angle_p != NULL) {
angle = *angle_p;
} else if (demo_mode == 5) {
} else if (demo_mode == daPy_demo_c::DEMO_WAIT_TURN_e) {
angle = mDemo.getMoveAngle();
} else {
angle = shape_angle.y;
@@ -715,7 +730,7 @@ void daAlink_c::setDemoData() {
}
}
if ((demo_mode == 2 || demo_mode == 3) && prm1_p != NULL && *prm1_p == 1) {
if ((demo_mode == daPy_demo_c::DEMO_UNK_2_e || demo_mode == daPy_demo_c::DEMO_UNK_3_e) && prm1_p != NULL && *prm1_p == 1) {
cXyz goal_pos;
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -726,9 +741,9 @@ void daAlink_c::setDemoData() {
}
}
if ((mEquipItem == IRONBALL || checkFishingRodItem(mEquipItem)) && demo_mode != 1 &&
demo_mode != 0x1F && (field_0x3184 != -1 || mDemo.getDemoType() == 3) &&
(demo_mode != 6 || (var_r28 == 0 && !checkEquipAnime())))
if ((mEquipItem == fpcNm_ITEM_IRONBALL || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e &&
demo_mode != daPy_demo_c::DEMO_UNK_31_e && (field_0x3184 != -1 || mDemo.getDemoType() == 3) &&
(demo_mode != daPy_demo_c::DEMO_UNK_6_e || (var_r28 == 0 && !checkEquipAnime())))
{
deleteEquipItem(FALSE, TRUE);
if (checkIronBallWaitAnime()) {
@@ -738,7 +753,7 @@ void daAlink_c::setDemoData() {
}
if (mDemo.getDemoType() == 4) {
if (mDemo.getDemoMode() == 0xE) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_14_e) {
if (mDemo.getTimer() != 0) {
mDemo.decTimer();
@@ -752,7 +767,7 @@ void daAlink_c::setDemoData() {
}
}
} else {
if (mDemo.getDemoType() == 1 || (mDemo.getDemoType() == 2 && field_0x3184 != -1)) {
if (mDemo.getDemoType() == daPy_demo_c::DEMO_UNK_1_e || (mDemo.getDemoType() == daPy_demo_c::DEMO_UNK_2_e && field_0x3184 != -1)) {
if (prm0_p != NULL) {
mDemo.setParam0(*prm0_p);
} else {
@@ -765,7 +780,7 @@ void daAlink_c::setDemoData() {
mDemo.setParam1(0);
}
if (demo_mode == 4) {
if (demo_mode == daPy_demo_c::DEMO_UNK_4_e) {
mNormalSpeed = 0.0f;
speedF = 0.0f;
field_0x814.ClrCcMove();
@@ -773,7 +788,7 @@ void daAlink_c::setDemoData() {
mDemo.setMoveAngle(angle);
} else if (checkDemoMoveMode(demo_mode)) {
setDemoMoveData(&demo_mode, pos_p);
} else if (demo_mode == 5) {
} else if (demo_mode == daPy_demo_c::DEMO_WAIT_TURN_e) {
mDemo.setMoveAngle(angle);
}
@@ -784,14 +799,14 @@ void daAlink_c::setDemoData() {
if (checkDemoMoveMode(demo_mode)) {
setDemoMoveData(&demo_mode, mDemo.getPos0());
mDemo.setDemoMode(demo_mode);
} else if (demo_mode == 0x41) {
mDemo.setDemoMode(1);
} else if (demo_mode == daPy_demo_c::DEMO_UNK_65_e) {
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK_1_e);
}
} else {
mDemo.setDemoMode(demo_mode);
}
if (checkModeFlg(0x80000) || mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) {
if (checkModeFlg(0x80000) || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_6_e || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e) {
dComIfGp_setPlayerStatus0(0, 0x10);
mMidnaTalkDelayTimer = 30;
} else {
@@ -799,10 +814,10 @@ void daAlink_c::setDemoData() {
}
if (field_0x3184 != -1 &&
(demo_mode == 1 || demo_mode == 4 || demo_mode == 0x17 || demo_mode == 0xE ||
demo_mode == 0x11 || demo_mode == 0x18 || demo_mode == 7 || demo_mode == 0xF ||
demo_mode == 0x15 || demo_mode == 0x16 || demo_mode == 6 || demo_mode == 8 ||
demo_mode == 0x29 || demo_mode == 0x12))
(demo_mode == daPy_demo_c::DEMO_UNK_1_e || demo_mode == daPy_demo_c::DEMO_UNK_4_e || demo_mode == daPy_demo_c::DEMO_UNK_23_e || demo_mode == daPy_demo_c::DEMO_UNK_14_e ||
demo_mode == daPy_demo_c::DEMO_UNK_17_e || demo_mode == daPy_demo_c::DEMO_UNK_24_e || demo_mode == daPy_demo_c::DEMO_UNK_7_e || demo_mode == daPy_demo_c::DEMO_UNK_15_e ||
demo_mode == daPy_demo_c::DEMO_UNK_21_e || demo_mode == daPy_demo_c::DEMO_UNK_22_e || demo_mode == daPy_demo_c::DEMO_UNK_6_e || demo_mode == daPy_demo_c::DEMO_UNK_8_e ||
demo_mode == daPy_demo_c::DEMO_CROUCH_e || demo_mode == daPy_demo_c::DEMO_UNK_18_e))
{
dComIfGp_evmng_cutEnd(field_0x3184);
}
@@ -897,7 +912,7 @@ void daAlink_c::endDemoMode() {
dComIfGp_clearPlayerStatus0(0, 0x10);
BOOL temp_r29 = mDemo.getDemoType() == 4;
BOOL var_r0 = mDemo.getDemoMode() == 0xE || mDemo.getDemoMode() == 0x1A;
BOOL var_r0 = mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_14_e || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_26_e;
mDemo.resetDemoType();
mDemo.setDemoMode(0);
@@ -943,7 +958,7 @@ void daAlink_c::endDemoMode() {
commonCheckNextAction(0);
} else if (mProcID == PROC_HAWK_CATCH || mProcID == PROC_HAWK_SUBJECT) {
procHawkSubjectInit();
} else if (mProcID == PROC_GRASS_WHISTLE_WAIT || (mDemo.getDemoMode() != 0x2D && mProcID == PROC_WARP)) {
} else if (mProcID == PROC_GRASS_WHISTLE_WAIT || (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_45_e && mProcID == PROC_WARP)) {
return;
} else if (mProcID == PROC_TALK && dComIfGp_checkPlayerStatus0(0, 0x8000000)) {
procWolfLieMoveInit(0);
@@ -986,7 +1001,7 @@ fopAc_ac_c* daAlink_c::getDemoLookActor() {
/* 80118170-801181A0 112AB0 0030+00 4/4 0/0 0/0 .text checkFlyAtnWait__9daAlink_cFv */
BOOL daAlink_c::checkFlyAtnWait() {
return mDemo.getDemoMode() == 0x17 && (mDemo.getParam1() == 4 || mDemo.getParam1() == 5);
return mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e && (mDemo.getParam1() == 4 || mDemo.getParam1() == 5);
}
/* 801181A0-801182D4 112AE0 0134+00 2/2 0/0 0/0 .text setGetItemFace__9daAlink_cFUs */
@@ -1077,7 +1092,7 @@ void daAlink_c::setShapeAngleToTalkActor() {
/* 80118654-801186D4 112F94 0080+00 2/2 0/0 0/0 .text setTalkAnime__9daAlink_cFv */
void daAlink_c::setTalkAnime() {
if (mDemo.getDemoMode() == 8 || mEquipItem == KANTERA ||
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == fpcNm_ITEM_KANTERA ||
(checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48))
{
setDoubleAnime(0.0f, daAlinkHIO_move_c0::m.mWaitAnmSpeed,
@@ -1100,7 +1115,7 @@ u8 daAlink_c::setTradeItemAnime() {
item_no = dComIfGp_event_getPreItemNo();
}
u32 partner_id = fopAcM_createItemForPresentDemo(
fpc_ProcID partner_id = fopAcM_createItemForPresentDemo(
&current.pos, item_no, 3, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale);
dComIfGp_event_setItemPartnerId(partner_id);
}
@@ -1123,7 +1138,7 @@ void daAlink_c::setTradeItemOutHand() {
/* 801187B4-80118840 1130F4 008C+00 5/5 0/0 0/0 .text checkEndMessage__9daAlink_cFUl */
BOOL daAlink_c::checkEndMessage(u32 param_0) {
if (mMsgClassID == -1) {
if (mMsgClassID == fpcM_ERROR_PROCESS_ID_e) {
mMsgClassID = fopMsgM_messageSet(param_0, 1000);
} else {
msg_class* msg = fopMsgM_SearchByID(mMsgClassID);
@@ -1237,7 +1252,7 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) {
i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1);
if (mProcID != PROC_DEAD && i_dmgAmount >= dComIfGs_getLife() && !checkMagicArmorNoDamage() &&
!dComIfGs_checkBottle(FAIRY))
!dComIfGs_checkBottle(fpcNm_ITEM_FAIRY))
{
onNoResetFlg2(FLG2_FORCE_GAMEOVER);
procCoDeadInit(0);
@@ -1262,7 +1277,7 @@ void daAlink_c::setDeadRideSyncPos() {
/* 80118C98-80118D7C 1135D8 00E4+00 5/5 0/0 0/0 .text checkDeadHP__9daAlink_cFv */
BOOL daAlink_c::checkDeadHP() {
return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(FAIRY)) ||
return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) ||
checkNoResetFlg2(FLG2_FORCE_GAMEOVER) ||
(dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0);
}
@@ -1296,9 +1311,9 @@ BOOL daAlink_c::checkDeadAction(int param_0) {
return commonFallInit(1);
}
} else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(FAIRY)) {
} else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) {
makeFairy(&current.pos, 0);
dComIfGs_setBottleItemIn(FAIRY, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_FAIRY, fpcNm_ITEM_EMPTY_BOTTLE);
}
}
@@ -1468,10 +1483,9 @@ int daAlink_c::procCoToolDemoInit() {
return 1;
}
f32 tmp_0 = 0.0f;
mNormalSpeed = tmp_0;
speedF = tmp_0;
speed.y = tmp_0;
mNormalSpeed = 0.0f;
speedF = 0.0f;
speed.y = 0.0f;
mUnderAnmHeap[0].resetArcNo();
mUnderAnmHeap[0].resetIdx();
@@ -1479,7 +1493,7 @@ int daAlink_c::procCoToolDemoInit() {
mUnderAnmHeap[1].resetIdx();
mUpperAnmHeap[1].resetIdx();
setDoubleAnimeBlendRatio(tmp_0);
setDoubleAnimeBlendRatio(0.0f);
mNowAnmPackUnder[1].setAnmTransform(NULL);
mNowAnmPackUpper[1].setAnmTransform(NULL);
@@ -1721,8 +1735,8 @@ int daAlink_c::procCoTalkInit() {
commonProcInit(PROC_TALK);
if (mDemo.getDemoMode() == 6) {
if (mEquipItem != KANTERA && mEquipItem != NO_ITEM) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_6_e) {
if (mEquipItem != fpcNm_ITEM_KANTERA && mEquipItem != fpcNm_ITEM_NONE) {
allUnequip(1);
}
}
@@ -1808,7 +1822,7 @@ int daAlink_c::procCoTalk() {
mNormalSpeed = 0.0f;
}
} else {
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mUpperAnmHeap[0].getIdx() != getMainBckData(ANM_WAIT)->m_upperID) {
setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, 3.0f);
}
@@ -1919,7 +1933,7 @@ int daAlink_c::procCoUnequipInit() {
setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor);
if (mDemo.getParam1() == 0) {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
allUnequip(0);
}
} else if (mDemo.getParam1() == 1) {
@@ -1942,7 +1956,7 @@ int daAlink_c::procCoUnequip() {
if (mProcVar2.field_0x300c != 0) {
if (checkAnmEnd(mUnderFrameCtrl)) {
setBlendMoveAnime(3.0f);
itemEquip(COPY_ROD);
itemEquip(fpcNm_ITEM_COPY_ROD);
f32 tmp_6 = 6.0f;
mUpperFrameCtrl[2].setFrame(tmp_6);
@@ -1979,8 +1993,8 @@ void daAlink_c::setGetSubBgm(int i_seTypeIdx) {
/* 8011A6FC-8011A798 11503C 009C+00 1/0 0/0 0/0 .text checkTreasureRupeeReturn__9daAlink_cCFi */
BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const {
if (i_itemNo == LINKS_SAVINGS) {
i_itemNo = PURPLE_RUPEE;
if (i_itemNo == fpcNm_ITEM_LINKS_SAVINGS) {
i_itemNo = fpcNm_ITEM_PURPLE_RUPEE;
}
i_itemNo -= 4;
@@ -2010,9 +2024,9 @@ int daAlink_c::procCoGetItemInit() {
mLinkAcch.ClrWallNone();
if (!checkWolf() && mEquipItem != NO_ITEM && var_r30 == 0) {
if (checkModeFlg(0x400) || (checkStageName("D_MN05B") && mEquipItem == BOOMERANG &&
!dComIfGs_isItemFirstBit(BOOMERANG)))
if (!checkWolf() && mEquipItem != fpcNm_ITEM_NONE && var_r30 == 0) {
if (checkModeFlg(0x400) || (checkStageName("D_MN05B") && mEquipItem == fpcNm_ITEM_BOOMERANG &&
!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOOMERANG)))
{
deleteEquipItem(0, 0);
} else {
@@ -2033,9 +2047,9 @@ int daAlink_c::procCoGetItemInit() {
item_no = dComIfGp_event_getGtItm();
}
int item_partner_id = fopAcM_createItemForPresentDemo(&current.pos, item_no, 0, -1,
fpc_ProcID item_partner_id = fopAcM_createItemForPresentDemo(&current.pos, item_no, 0, -1,
fopAcM_GetRoomNo(this), NULL, NULL);
if (item_partner_id != 0xFFFFFFFF) {
if (item_partner_id != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(item_partner_id);
}
@@ -2116,7 +2130,7 @@ int daAlink_c::procCoGetItemInit() {
}
current.angle.y = shape_angle.y;
mMsgClassID = -1;
mMsgClassID = fpcM_ERROR_PROCESS_ID_e;
mProcVar0.field_0x3008 = 0;
field_0x3198 = 0;
field_0x32cc = 0;
@@ -2283,7 +2297,7 @@ int daAlink_c::procCoGetItem() {
dComIfGs_isItemFirstBit(mProcVar2.field_0x300c))
{
field_0x32cc += 2000;
mMsgClassID = -1;
mMsgClassID = fpcM_ERROR_PROCESS_ID_e;
return 1;
}
@@ -2293,7 +2307,7 @@ int daAlink_c::procCoGetItem() {
}
field_0x32cc += 0x5DC;
mMsgClassID = -1;
mMsgClassID = fpcM_ERROR_PROCESS_ID_e;
return 1;
}
}
@@ -2306,7 +2320,7 @@ int daAlink_c::procCoGetItem() {
if (checkWolf()) {
setBlendWolfMoveAnime(daAlinkHIO_wlMove_c0::m.field_0x94);
} else {
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
field_0x2f94 = 0;
}
@@ -2624,9 +2638,8 @@ int daAlink_c::procMonkeyMoveInit() {
current.angle.y = shape_angle.y;
setSpecialGravity(0.0f, maxFallSpeed, 0);
f32 tmp_0 = 0.0f;
speed.y = tmp_0;
mNormalSpeed = tmp_0;
speed.y = 0.0f;
mNormalSpeed = 0.0f;
deleteEquipItem(FALSE, FALSE);
if (!checkWolf()) {
@@ -2655,7 +2668,7 @@ int daAlink_c::procDemoBoomerangCatchInit() {
mNormalSpeed = 0.0f;
deleteEquipItem(FALSE, FALSE);
mEquipItem = BOOMERANG;
mEquipItem = fpcNm_ITEM_BOOMERANG;
setItemActor();
setSingleAnimeParam(ANM_BOOMERANG_CATCH, &daAlinkHIO_boom_c0::m.mCatchAnm);
return 1;
@@ -2964,10 +2977,9 @@ int daAlink_c::procCoCaughtInit() {
onModeFlg(0x40000);
}
f32 tmp_0 = 0.0f;
mNormalSpeed = tmp_0;
speed.y = tmp_0;
setSpecialGravity(tmp_0, maxFallSpeed, 0);
mNormalSpeed = 0.0f;
speed.y = 0.0f;
setSpecialGravity(0.0f, maxFallSpeed, 0);
mBodyAngle.z = 0;
return 1;
}
@@ -3311,7 +3323,7 @@ int daAlink_c::procCoGetReadySitInit() {
return 1;
}
if (mEquipItem != NO_ITEM && !checkWolf()) {
if (mEquipItem != fpcNm_ITEM_NONE && !checkWolf()) {
return procPreActionUnequipInit(PROC_GET_READY_SIT, NULL);
}
@@ -3453,10 +3465,9 @@ int daAlink_c::procZoraMoveInit() {
}
setSingleAnimeBase(ANM_HORSE_TAME_WAIT_B);
f32 tmp_0 = 0.0f;
speed.y = tmp_0;
mNormalSpeed = tmp_0;
setSpecialGravity(tmp_0, maxFallSpeed, 0);
speed.y = 0.0f;
mNormalSpeed = 0.0f;
setSpecialGravity(0.0f, maxFallSpeed, 0);
deleteEquipItem(FALSE, TRUE);
mProcVar4.field_0x3010 = 5000;
@@ -3646,8 +3657,8 @@ int daAlink_c::procTradeItemOut() {
/* 8011E3D8-8011E448 118D18 0070+00 2/2 0/0 0/0 .text checkLetterItem__9daAlink_cFi */
BOOL daAlink_c::checkLetterItem(int i_itemNo) {
return i_itemNo == LETTER || i_itemNo == BILL || i_itemNo == RAFRELS_MEMO ||
i_itemNo == TKS_LETTER || i_itemNo == ASHS_SCRIBBLING;
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;
}
/* 8011E448-8011E57C 118D88 0134+00 1/1 0/0 0/0 .text procNotUseItemInit__9daAlink_cFi */
@@ -3661,7 +3672,7 @@ int daAlink_c::procNotUseItemInit(int param_0) {
setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT);
mNormalSpeed = 0.0f;
mMsgClassID = -1;
mMsgClassID = fpcM_ERROR_PROCESS_ID_e;
field_0x3198 = param_0;
mProcVar2.field_0x300c = 0;
mProcVar3.field_0x300e = 0;
@@ -3684,7 +3695,7 @@ int daAlink_c::procNotUseItemInit(int param_0) {
/* 8011E57C-8011E6E0 118EBC 0164+00 1/0 0/0 0/0 .text procNotUseItem__9daAlink_cFv */
int daAlink_c::procNotUseItem() {
if (mProcVar2.field_0x300c == 0) {
u32 item_partner_id = fopAcM_createItemForPresentDemo(
fpc_ProcID item_partner_id = fopAcM_createItemForPresentDemo(
&current.pos, field_0x3198, 5, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale);
dComIfGp_event_setItemPartnerId(item_partner_id);
mProcVar2.field_0x300c = 1;
@@ -3821,9 +3832,8 @@ int daAlink_c::procGanonFinishInit() {
setSingleAnimeBase(ANM_GANON_FINISH);
f32 tmp_0 = 0.0f;
mNormalSpeed = tmp_0;
speed.y = tmp_0;
mNormalSpeed = 0.0f;
speed.y = 0.0f;
field_0x37c8 = current.pos;
onEndResetFlg1(ERFLG1_GANON_FINISH);
@@ -3944,8 +3954,8 @@ int daAlink_c::procDungeonWarpReadyInit() {
return 0;
}
u32 id;
if (checkItemSetButton(DUNGEON_EXIT) != 2) {
fpc_ProcID id;
if (checkItemSetButton(fpcNm_ITEM_DUNGEON_EXIT) != 2) {
id = fopAcM_create(PROC_OBJ_TKS, 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
NULL, -1);
} else {
@@ -3953,7 +3963,7 @@ int daAlink_c::procDungeonWarpReadyInit() {
NULL, -1);
}
if (id == -1) {
if (id == fpcM_ERROR_PROCESS_ID_e) {
return 0;
}
@@ -4038,7 +4048,7 @@ int daAlink_c::procDungeonWarp() {
if (scale.x < 0.01f) {
onNoResetFlg0(FLG0_PLAYER_NO_DRAW);
if (checkItemGet(DUNGEON_EXIT, 1)) {
if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) {
int escape =
dStage_stagInfo_GetEscapeWarp(dComIfGp_getStage()->getStagInfo());
dStage_changeScene(escape, 0.0f, 12, -1, shape_angle.y, -1);
@@ -4344,11 +4354,11 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
}
}
if (checkItemGet(DUNGEON_EXIT, 1) ||
(checkItemGet(DUNGEON_BACK, 1) &&
if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1) ||
(checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) &&
strcmp(sp8, dComIfGs_getWarpStageName()) == 0))
{
dComIfGs_setItem(SLOT_18, NO_ITEM);
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE);
dComIfGs_resetLastWarpAcceptStage();
}
}
@@ -4409,7 +4419,7 @@ int daAlink_c::procCoWarp() {
setSpecialGravity(var_f1, maxFallSpeed, 1);
}
if (mDemo.getDemoMode() == 0x2D) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_45_e) {
if (mProcVar5.field_0x3012 == 0) {
mProcVar5.field_0x3012 = 1;
}
@@ -4435,7 +4445,7 @@ int daAlink_c::procCoWarp() {
mProcVar0.field_0x3008--;
} else if (warpModelTexScroll()) {
if (mProcVar2.field_0x300c != 0) {
if (mDemo.getDemoMode() == 0x2D) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_45_e) {
if (mProcVar1.field_0x300a != 0) {
if (field_0x3174 == 4) {
dComIfGp_setNextStage(dComIfGp_getStartStageName(), mProcVar4.field_0x3010,
src/d/actor/d_a_alink_effect.inc
+3 -3
View File
@@ -1495,7 +1495,7 @@ void daAlink_c::resetFairyEffect() {
/* 80124BA4-80124E28 11F4E4 0284+00 1/1 0/0 0/0 .text setBottleEffect__9daAlink_cFv */
void daAlink_c::setBottleEffect() {
if (mEquipItem == FAIRY) {
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mpHookTipModel != NULL) {
cXyz sp2C;
mDoMtx_multVecZero(mpHookTipModel->getAnmMtx(2), &sp2C);
@@ -1507,7 +1507,7 @@ void daAlink_c::setBottleEffect() {
setEmitter(&field_0x325c, 0x734, &sp2C, NULL);
}
} else if (mEquipItem == CHUCHU_RARE && mProcID == PROC_BOTTLE_GET) {
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE && mProcID == PROC_BOTTLE_GET) {
if (field_0x072c != NULL && field_0x072c->getFrame() < 2.0f) {
cXyz sp20;
mDoMtx_multVec(mHeldItemModel->getAnmMtx(0), &chuchuLocalOffset, &sp20);
@@ -1517,7 +1517,7 @@ void daAlink_c::setBottleEffect() {
temp_r3_2->setGlobalScale(chuchuScale);
}
}
} else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == WATER_BOTTLE) {
} else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
JPABaseEmitter* temp_r3_3 = setEmitter(&field_0x325c, 0x344, &current.pos, NULL);
if (temp_r3_3 != NULL) {
temp_r3_3->setGlobalRTMatrix(mHeldItemModel->getBaseTRMtx());
src/d/actor/d_a_alink_grab.inc
+13 -13
View File
@@ -85,7 +85,7 @@ BOOL daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) {
/* 800E3A9C-800E3BCC 0DE3DC 0130+00 1/0 0/0 0/0 .text setForceGrab__9daAlink_cFP10fopAc_ac_cii */
BOOL daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) {
if (((param_1 != 0 || !checkEventRun()) && !checkWolf()) &&
(((mEquipItem == NO_ITEM || (param_2 != 0 && checkHookshotItem(mEquipItem)))) &&
(((mEquipItem == fpcNm_ITEM_NONE || (param_2 != 0 && checkHookshotItem(mEquipItem)))) &&
((checkModeFlg(MODE_UNK_10000000) &&
(checkHorseNoUpperAnime() || checkHorseTurnAnime())) ||
param_2 != 0 && checkHookshotAnime())))
@@ -723,7 +723,7 @@ int daAlink_c::procGrabReadyInit() {
return checkWaitAction();
}
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_GRAB_READY, field_0x27f4);
}
@@ -1210,7 +1210,7 @@ int daAlink_c::procInsectCatchInit() {
return checkWaitAction();
}
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_INSECT_CATCH, field_0x27f4);
}
@@ -1252,7 +1252,7 @@ int daAlink_c::procPickUpInit() {
return checkWaitAction();
}
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_PICK_UP, field_0x27f4);
}
@@ -1323,7 +1323,7 @@ int daAlink_c::procPickUp() {
onResetFlg0(RFLG0_UNK_8000);
if (mProcVar4.field_0x3010 != 0) {
mEquipItem = KANTERA;
mEquipItem = fpcNm_ITEM_KANTERA;
setKandelaarModel();
}
}
@@ -1345,7 +1345,7 @@ int daAlink_c::procPickUp() {
/* 800E75EC-800E76E0 0E1F2C 00F4+00 3/3 0/0 0/0 .text procPickPutInit__9daAlink_cFi */
int daAlink_c::procPickPutInit(int param_0) {
if (param_0 != 0 && mEquipItem != NO_ITEM) {
if (param_0 != 0 && mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_PICK_PUT, NULL);
}
@@ -1363,7 +1363,7 @@ int daAlink_c::procPickPutInit(int param_0) {
mProcVar2.field_0x300c = param_0;
if (mProcVar2.field_0x300c != 0) {
mEquipItem = POKE_BOMB;
mEquipItem = fpcNm_ITEM_POKE_BOMB;
} else {
onResetFlg0(RFLG0_GRAB_PUT_START);
}
@@ -1397,7 +1397,7 @@ int daAlink_c::procPickPut() {
dComIfGp_addSelectItemNum(mSelectItemId, -1);
field_0x2fcf++;
}
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
} else {
field_0x3198 = 0;
temp_r3->speedF = 0.0f;
@@ -1490,7 +1490,7 @@ bool daAlink_c::checkChainBlockPushPull() {
/* 800E7C30-800E7CC0 0E2570 0090+00 2/2 0/0 0/0 .text procFmChainUpInit__9daAlink_cFv */
int daAlink_c::procFmChainUpInit() {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_CHAIN_UP, NULL);
}
@@ -1722,7 +1722,7 @@ f32 daAlink_c::getPushPullAnimeSpeed() {
/* 800E8428-800E857C 0E2D68 0154+00 4/4 0/0 0/0 .text procCoPushPullWaitInit__9daAlink_cFi */
int daAlink_c::procCoPushPullWaitInit(int param_0) {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_PUSH_PULL_WAIT, NULL);
}
@@ -2518,7 +2518,7 @@ int daAlink_c::procGoatCatch() {
/* 800EA2A8-800EA3AC 0E4BE8 0104+00 2/2 0/0 0/0 .text procGoatStrokeInit__9daAlink_cFv */
int daAlink_c::procGoatStrokeInit() {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_GOAT_STROKE, field_0x27f4);
}
@@ -2552,7 +2552,7 @@ int daAlink_c::procGoatStroke() {
/* 800EA3F4-800EA4CC 0E4D34 00D8+00 2/2 0/0 0/0 .text procGoronMoveInit__9daAlink_cFv */
int daAlink_c::procGoronMoveInit() {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_GORON_MOVE, NULL);
}
@@ -2594,7 +2594,7 @@ int daAlink_c::procGoronMove() {
current.angle.y = shape_angle.y + 0x4000;
}
if (checkSetItemTrigger(HVY_BOOTS)) {
if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) {
return procBootsEquipInit();
}
src/d/actor/d_a_alink_guard.inc
+8 -8
View File
@@ -63,8 +63,8 @@ void daAlink_c::stickArrowIncrement(int param_0) {
}
if (arrow_num != 0) {
if (i_checkShieldGet() && checkItemGet(BOW, true)) {
int arrow_type = arrow_num == 1 ? ARROW_1 : ARROW_10;
if (i_checkShieldGet() && checkItemGet(fpcNm_ITEM_BOW, true)) {
int arrow_type = arrow_num == 1 ? fpcNm_ITEM_ARROW_1 : fpcNm_ITEM_ARROW_10;
dComIfGp_setItemArrowNumCount(arrow_num);
fopAcM_createItemForSimpleDemo(&current.pos, arrow_type, -1, NULL, NULL, 0.0f,
@@ -107,7 +107,7 @@ void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) {
field_0x2f7c[i] = 10;
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, fpcNm_ITEM_ARROW_10, -1, NULL, NULL, 0.0f, 0.0f);
}
if (param_1 && field_0x2fcb == 0 && !checkMagicArmorNoDamage()) {
@@ -198,7 +198,7 @@ void daAlink_c::setUpperGuardAnime(f32) {
/* 800DD018-800DD114 0D7958 00FC+00 1/1 0/0 0/0 .text setShieldGuard__9daAlink_cFv */
void daAlink_c::setShieldGuard() {
if ((mProcID == PROC_GUARD_SLIP && mEquipItem != IRONBALL) || checkSmallUpperGuardAnime() ||
if ((mProcID == PROC_GUARD_SLIP && mEquipItem != fpcNm_ITEM_IRONBALL) || checkSmallUpperGuardAnime() ||
(checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() &&
!checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() &&
!checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) &&
@@ -270,7 +270,7 @@ int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) {
cXyz* temp_r3 = getDamageVec(param_1);
current.angle.y = temp_r3->atan2sX_Z();
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
setSingleAnimeBase(ANM_IRONBALL_DEF);
setIronBallWaitUpperAnime(1);
mNowAnmPackUpper[2].setRatio(0.0f);
@@ -339,7 +339,7 @@ int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) {
/* 800DD894-800DDA10 0D81D4 017C+00 1/0 0/0 0/0 .text procGuardSlip__9daAlink_cFv */
int daAlink_c::procGuardSlip() {
if (mEquipItem != IRONBALL) {
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
setUpperGuardAnime(-1.0f);
}
@@ -373,7 +373,7 @@ int daAlink_c::procGuardSlip() {
onEndResetFlg1(ERFLG1_UNK_20);
}
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
mNowAnmPackUpper[2].setRatio(1.0f);
}
@@ -513,7 +513,7 @@ int daAlink_c::procGuardBreakInit() {
commonProcInit(PROC_GUARD_BREAK);
setSingleAnimeParam(ANM_GUARD_BREAK, &daAlinkHIO_guard_c0::m.mGuardBreakAnm);
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
deleteEquipItem(0, 0);
}
src/d/actor/d_a_alink_hang.inc
+4 -4
View File
@@ -820,7 +820,7 @@ int daAlink_c::procHangWallCatch() {
/* 800FC178-800FC240 0F6AB8 00C8+00 4/4 0/0 0/0 .text procHangReadyInit__9daAlink_cFv */
int daAlink_c::procHangReadyInit() {
if (field_0x2f91 == 3 && mEquipItem != NO_ITEM) {
if (field_0x2f91 == 3 && mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(0x5C, NULL);
} else if (mProcID == PROC_PREACTION_UNEQUIP) {
setFrontWallType();
@@ -870,7 +870,7 @@ int daAlink_c::procHangReady() {
/* 800FC2F4-800FC390 0F6C34 009C+00 2/2 0/0 0/0 .text procHangLeverDownInit__9daAlink_cFv
*/
int daAlink_c::procHangLeverDownInit() {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_HANG_LEVER_DOWN, field_0x27f4);
}
@@ -1373,7 +1373,7 @@ int daAlink_c::checkLadderFall() {
/* 800FD648-800FD7B0 0F7F88 0168+00 2/2 0/0 0/0 .text procLadderUpStartInit__9daAlink_cFv
*/
int daAlink_c::procLadderUpStartInit() {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_LADDER_UP_START, NULL);
}
@@ -1479,7 +1479,7 @@ int daAlink_c::procLadderUpEnd() {
int daAlink_c::procLadderDownStartInit() {
onNoResetFlg3(FLG3_UNK_400000);
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_LADDER_DOWN_START, NULL);
}
src/d/actor/d_a_alink_hook.inc
+8 -8
View File
@@ -313,7 +313,7 @@ void daAlink_c::cancelHookshotCarry() {
/* 80108864-801088A0 1031A4 003C+00 2/2 0/0 0/0 .text changeHookshotDrawModel__9daAlink_cFv */
void daAlink_c::changeHookshotDrawModel() {
if (mEquipItem == HOOKSHOT && field_0x3020 == 1) {
if (mEquipItem == fpcNm_ITEM_HOOKSHOT && field_0x3020 == 1) {
J3DModel* old_item = mHeldItemModel;
mHeldItemModel = field_0x0710;
field_0x0710 = old_item;
@@ -432,7 +432,7 @@ void daAlink_c::setHookshotModel() {
resetHookshotMode();
mpHookChain->setUserArea((u32)this);
field_0x2f94 = 1;
if (mEquipItem == W_HOOKSHOT) {
if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT) {
field_0x2f95 = 6;
}
@@ -1386,7 +1386,7 @@ int daAlink_c::checkLandHookshotHang() {
((mProcID != PROC_HOOKSHOT_ROOF_SHOOT && mProcID != PROC_HOOKSHOT_WALL_SHOOT) ||
checkHookshotWait()) &&
(!checkHookshotRoofLv7Boss() || !checkEquipHeavyBoots()) &&
checkSetItemTrigger(HVY_BOOTS))
checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS))
{
if (dComIfGp_checkPlayerStatus1(0, 0x10000)) {
return procHookshotRoofBootsInit(mCargoCarryAcKeep.getActor());
@@ -1615,7 +1615,7 @@ int daAlink_c::procHookshotFly() {
}
current.pos += field_0x37d4;
if (checkSetItemTrigger(W_HOOKSHOT) != 0) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) != 0) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
@@ -1804,7 +1804,7 @@ int daAlink_c::procHookshotRoofWait() {
setShapeAngleToAtnActor(0);
if (mProcVar2.field_0x300c == 0) {
if (checkSetItemTrigger(W_HOOKSHOT)) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
@@ -1819,7 +1819,7 @@ int daAlink_c::procHookshotRoofWait() {
mProcVar2.field_0x300c = 1;
}
} else if (!checkHookshotRoofLv7Boss()) {
if (checkSetItemTrigger(W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
return procHookshotRoofShootInit(mCargoCarryAcKeep.getActor());
}
hookshotRoofTurn();
@@ -2081,7 +2081,7 @@ int daAlink_c::procHookshotWallWait() {
}
if (mProcVar2.field_0x300c == 0) {
if (checkSetItemTrigger(W_HOOKSHOT)) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
@@ -2095,7 +2095,7 @@ int daAlink_c::procHookshotWallWait() {
setHookshotWallWaitAnime();
mProcVar2.field_0x300c = 1;
}
} else if (checkSetItemTrigger(W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
} else if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
return procHookshotWallShootInit();
}
src/d/actor/d_a_alink_horse.inc
+4 -4
View File
@@ -194,7 +194,7 @@ void daAlink_c::rideGetOff() {
seStartOnlyReverb(Z2SE_AL_SPINNER_END);
} else if (checkCanoeRide()) {
if (mEquipItem == 0x10B) {
mEquipItem = NO_ITEM;
mEquipItem = fpcNm_ITEM_NONE;
}
} else if (checkBoardRide()) {
static_cast<daObjIceLeaf_c*>(mRideAcKeep.getActor())->offRide();
@@ -1224,7 +1224,7 @@ int daAlink_c::checkHorseGetOffAndSetDoStatus() {
setDoStatus(0x8C);
}
} else if ((checkHorseNoUpperAnime() || checkEquipAnime()) && mMidnaTalkDelayTimer == 0 && !checkInputOnR() && temp_r28) {
if (mEquipItem == NO_ITEM) {
if (mEquipItem == fpcNm_ITEM_NONE) {
var_r30 = checkHorseGetOffDirection();
if ((var_r30 != DIR_LEFT || (checkHorseRide() && temp_r29->checkEnemySearch())) && field_0x2fb4 == 0) {
if (!checkSpecialHorseRide()) {
@@ -1265,7 +1265,7 @@ int daAlink_c::setHorseGetOff(int param_0) {
int daAlink_c::procHorseRideInit() {
BOOL var_r25 = 0;
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem == 0x103) {
var_r25 = 1;
}
@@ -1524,7 +1524,7 @@ int daAlink_c::procHorseGetOffInit(int param_0) {
commonProcInit(PROC_HORSE_GETOFF);
resetUnderAnime(UNDER_2, -1.0f);
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
allUnequip(0);
}
src/d/actor/d_a_alink_ironball.inc
+8 -8
View File
@@ -8,7 +8,7 @@
/* 8011243C-80112458 10CD7C 001C+00 1/0 0/0 0/0 .text getIronBallCenterPos__9daAlink_cFv
*/
cXyz* daAlink_c::getIronBallCenterPos() {
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
return &mIronBallCenterPos;
}
@@ -17,7 +17,7 @@ cXyz* daAlink_c::getIronBallCenterPos() {
/* 80112458-80112474 10CD98 001C+00 1/0 0/0 0/0 .text getIronBallBgHit__9daAlink_cCFv */
int daAlink_c::getIronBallBgHit() const {
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
return field_0x301c;
}
@@ -26,26 +26,26 @@ int daAlink_c::getIronBallBgHit() const {
/* 80112474-801124B4 10CDB4 0040+00 0/0 2/2 1/1 .text checkIronBallThrowMode__9daAlink_cCFv */
bool daAlink_c::checkIronBallThrowMode() const {
return mEquipItem == IRONBALL &&
return mEquipItem == fpcNm_ITEM_IRONBALL &&
(mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 3);
}
/* 801124B4-801124FC 10CDF4 0048+00 0/0 1/1 1/1 .text checkIronBallThrowReturnMode__9daAlink_cCFv
*/
bool daAlink_c::checkIronBallThrowReturnMode() const {
return mEquipItem == IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 ||
return mEquipItem == fpcNm_ITEM_IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 ||
mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 3);
}
/* 801124FC-80112524 10CE3C 0028+00 1/0 0/0 0/0 .text checkIronBallReturn__9daAlink_cCFv
*/
bool daAlink_c::checkIronBallReturn() const {
return mEquipItem == IRONBALL && mItemVar0.field_0x3018 == 7;
return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 == 7;
}
/* 80112524-80112568 10CE64 0044+00 1/0 0/0 0/0 .text checkIronBallGroundStop__9daAlink_cCFv */
bool daAlink_c::checkIronBallGroundStop() const {
return mEquipItem == IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 &&
return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 &&
field_0x301e < 10;
}
@@ -1033,7 +1033,7 @@ int daAlink_c::procIronBallThrowInit() {
int daAlink_c::procIronBallThrow() {
daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
if (mEquipItem != IRONBALL) {
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
return checkWaitAction();
}
@@ -1093,7 +1093,7 @@ int daAlink_c::procIronBallReturnInit() {
int daAlink_c::procIronBallReturn() {
daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
if (mEquipItem != IRONBALL) {
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
return checkWaitAction();
}
src/d/actor/d_a_alink_kandelaar.inc
+4 -4
View File
@@ -73,7 +73,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 == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
deleteEquipItem(TRUE, TRUE);
} else {
offKandelaarModel();
@@ -92,7 +92,7 @@ void daAlink_c::offKandelaarModel() {
/* 8011087C-801108B4 10B1BC 0038+00 1/0 0/0 0/0 .text checkUseKandelaar__9daAlink_cFi */
bool daAlink_c::checkUseKandelaar(int param_0) {
return (param_0 == 0 && checkNoResetFlg2(FLG2_UNK_1)) ||
(param_0 != 0 && mEquipItem == KANTERA);
(param_0 != 0 && mEquipItem == fpcNm_ITEM_KANTERA);
}
/* 801108B4-801108EC 10B1F4 0038+00 1/0 0/0 0/0 .text checkKandelaarSwing__9daAlink_cCFi
@@ -256,7 +256,7 @@ void daAlink_c::resetOilBottleModel() {
if (mProcVar3.field_0x300e != 0) {
setKandelaarModel();
mEquipItem = KANTERA;
mEquipItem = fpcNm_ITEM_KANTERA;
}
returnKeepItemData();
@@ -346,7 +346,7 @@ int daAlink_c::commonKandelaarPour(int param_0) {
/* 8011130C-80111440 10BC4C 0134+00 1/1 0/0 0/0 .text initKandelaarSwing__9daAlink_cFv */
void daAlink_c::initKandelaarSwing() {
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (dComIfGs_getOil() != 0) {
mZ2Link.getKantera().startSound(Z2SE_AL_KANTERA_SWING, 0, mVoiceReverbIntensity);
} else {
src/d/actor/d_a_alink_link.inc
+30 -30
View File
@@ -23,7 +23,7 @@ int daAlink_c::procPreActionUnequipInit(int i_procAfter, fopAc_ac_c* param_1) {
mProcVar3.field_0x300e = 1;
if (fopAcM_GetName(param_1) == PROC_Tag_Lv8Gate) {
if (mEquipItem == KANTERA) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
mProcVar4.field_0x3010 = 1;
} else if (checkNoResetFlg2(FLG2_UNK_1)) {
offKandelaarModel();
@@ -559,7 +559,7 @@ int daAlink_c::procSideStepLandInit() {
field_0x2fb0 = 8;
field_0x2fcc = 0;
if (checkEnemyGroup(mTargetedActor) && mEquipItem == EQUIP_SWORD && checkNoUpperAnime()) {
if (checkEnemyGroup(mTargetedActor) && mEquipItem == 0x103 && checkNoUpperAnime()) {
setUpperAnimeBaseSpeed(uvar3, daAlinkHIO_atnMove_c0::m.mWaitAnmSpeed, -1.0f);
seStartSwordCut(Z2SE_AL_WAIT_SWORD_SWING);
}
@@ -1190,7 +1190,7 @@ int daAlink_c::procBackJump() {
offModeFlg(0x2000);
}
if (checkCutTurnInput() && mEquipItem == EQUIP_SWORD) {
if (checkCutTurnInput() && mEquipItem == 0x103) {
field_0x3198 = getCutTurnDirection();
}
@@ -1247,7 +1247,7 @@ int daAlink_c::procBackJumpLand() {
checkNextAction(0);
}
} else if (frameCtrl->getFrame() > daAlinkHIO_backJump_c0::m.mLandAnm.mCheckFrame) {
if (mEquipItem == EQUIP_SWORD && (field_0x3198 != 2 || checkCutTurnInput())) {
if (mEquipItem == 0x103 && (field_0x3198 != 2 || checkCutTurnInput())) {
return procCutTurnInit(1, field_0x3198);
}
@@ -1448,7 +1448,7 @@ int daAlink_c::procAutoJump() {
setLandPassiveData();
if (!checkModeFlg(4) && checkSetItemTrigger(HVY_BOOTS)) {
if (!checkModeFlg(4) && checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) {
setHeavyBoots(1);
}
@@ -2428,7 +2428,7 @@ int daAlink_c::execute() {
shape_angle.y = field_0x3108;
}
if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA && checkItemSetButton(KANTERA) == 2) {
if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != fpcNm_ITEM_KANTERA && checkItemSetButton(fpcNm_ITEM_KANTERA) == 2) {
offKandelaarModel();
}
@@ -2439,7 +2439,7 @@ int daAlink_c::execute() {
field_0x3184 = dComIfGp_evmng_getMyStaffId("Alink", this, 0);
if (eventInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(4) &&
mEquipItem == noentry71)
mEquipItem == 0x102)
{
deleteEquipItem(FALSE, FALSE);
}
@@ -2515,7 +2515,7 @@ int daAlink_c::execute() {
field_0x2f9d = 0;
field_0x2fc1 = 6;
if (!checkSwordGet() && mEquipItem == EQUIP_SWORD) {
if (!checkSwordGet() && mEquipItem == 0x103) {
deleteEquipItem(FALSE, FALSE);
}
@@ -2709,7 +2709,7 @@ int daAlink_c::execute() {
}
}
if (checkEndResetFlg0(ERFLG0_UNK_1000000) && mEquipItem == EQUIP_SWORD) {
if (checkEndResetFlg0(ERFLG0_UNK_1000000) && mEquipItem == 0x103) {
mSwordFlourishTimer = daAlinkHIO_cut_c0::m.mFlourishTime;
}
@@ -2733,7 +2733,7 @@ int daAlink_c::execute() {
}
if (checkEquipHeavyBoots()) {
int temp_r3_22 = checkItemSetButton(HVY_BOOTS);
int temp_r3_22 = checkItemSetButton(fpcNm_ITEM_HVY_BOOTS);
if (temp_r3_22 == 2 || checkNotHeavyBootsStage()) {
if (!dComIfGp_checkPlayerStatus1(0, 0x10000) || !checkHookshotRoofLv7Boss()) {
setHeavyBoots(0);
@@ -2784,7 +2784,7 @@ int daAlink_c::execute() {
resetUpperAnime(UPPER_2, 5.0f);
}
if (mEquipItem == KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() &&
if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() &&
(checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH))
{
if (checkReinRide()) {
@@ -3056,7 +3056,7 @@ int daAlink_c::execute() {
field_0x2fcb--;
if (field_0x2fcb == 0) {
dMeter2Info_setShield(NO_ITEM, true);
dMeter2Info_setShield(fpcNm_ITEM_NONE, true);
stickArrowIncrement(1);
setWoodShieldBurnOutEffect();
@@ -3065,7 +3065,7 @@ int daAlink_c::execute() {
stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
if (dStage_stagInfo_GetSaveTbl(pstag) == 0x11 &&
!dComIfGs_isItemFirstBit(HYLIA_SHIELD))
!dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD))
{
fopAcM_onSwitch(this, 0x6F);
}
@@ -3239,8 +3239,8 @@ int daAlink_c::execute() {
if (!checkWolf()) {
for (u8 i = 0; i < 2; i++) {
u8 tmp = (i + 1) % 2;
if (dComIfGp_getSelectItem(i) == EMPTY_BOTTLE && (field_0x2fae & (1 << i)) &&
dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE)
if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_EMPTY_BOTTLE && (field_0x2fae & (1 << i)) &&
dComIfGp_getSelectItem(tmp) == fpcNm_ITEM_EMPTY_BOTTLE)
{
field_0x2fae |= (u8)(1 << tmp);
}
@@ -3352,7 +3352,7 @@ int daAlink_c::execute() {
}
if (dComIfGp_att_getCatghTarget() != NULL && !checkWolf()) {
if (!checkRideOn() && checkCastleTownUseItem(EMPTY_BOTTLE)) {
if (!checkRideOn() && checkCastleTownUseItem(fpcNm_ITEM_EMPTY_BOTTLE)) {
dComIfGp_setBottleStatus(0x6C, 0);
}
}
@@ -3541,7 +3541,7 @@ bool daAlink_c::checkShieldDraw() {
/* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text checkItemDraw__9daAlink_cFv */
bool daAlink_c::checkItemDraw() {
if (mHeldItemModel != NULL && (mEquipItem != IRONBALL || !checkSwordEquipAnime())) {
if (mHeldItemModel != NULL && (mEquipItem != fpcNm_ITEM_IRONBALL || !checkSwordEquipAnime())) {
if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !i_checkShieldGet() ||
field_0x2e44.checkPassNum(15))
{
@@ -3759,12 +3759,12 @@ void daAlink_c::shadowDraw() {
dComIfGd_addRealShadow(var_r29, mpDemoHRTmpModel);
}
if (mEquipItem == BOOMERANG) {
if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
if (mItemAcKeep.getActor() != NULL) {
dComIfGd_addRealShadow(var_r29, mItemAcKeep.getActor()->model);
}
} else if (checkItemDraw()) {
if (mEquipItem == IRONBALL) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mItemVar0.field_0x3018 == 0 || mItemVar0.field_0x3018 == 8) {
dComIfGd_addRealShadow(var_r29, mHeldItemModel);
} else {
@@ -3781,7 +3781,7 @@ void daAlink_c::shadowDraw() {
dComIfGd_addRealShadow(var_r29, mpHookTipModel);
}
if (mEquipItem == W_HOOKSHOT && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) {
if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) {
dComIfGd_addRealShadow(var_r29, field_0x0710);
if (!dComIfGp_checkPlayerStatus1(0, 0x10000)) {
@@ -4194,7 +4194,7 @@ int daAlink_c::draw() {
modelDraw(mpHookTipModel, temp_r30);
}
if (mEquipItem == W_HOOKSHOT && !checkPlayerGuardAndAttack() &&
if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && !checkPlayerGuardAndAttack() &&
!checkNoResetFlg0(FLG0_UNK_2))
{
if (field_0x0710 != NULL) {
@@ -4211,7 +4211,7 @@ int daAlink_c::draw() {
if (mpHookChain != NULL && !temp_r30 &&
((checkHookshotItem(mEquipItem) && (mHeldItemRootPos.abs(mHookshotTopPos) > 1.0f ||
field_0x3810.abs(mIronBallBgChkPos) > 1.0f)) ||
mEquipItem == IRONBALL))
mEquipItem == fpcNm_ITEM_IRONBALL))
{
dComIfGd_getOpaListDark()->entryImm(mpHookChain, 0);
}
@@ -4440,7 +4440,7 @@ BOOL daAlink_c::setBodyAngleToCamera() {
}
s16 var_r29;
if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == IRONBALL) {
if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == fpcNm_ITEM_IRONBALL) {
var_r29 = -10000;
} else {
var_r29 = daAlinkHIO_item_c0::m.mItemFPUpMaxUnk;
@@ -4478,7 +4478,7 @@ BOOL daAlink_c::subjectCancelTrigger() {
int daAlink_c::checkSubjectEnd(BOOL i_playSound) {
setDoStatus(0x12);
if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_UNK_80000000) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) {
if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_UNK_80000000) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) {
if (i_playSound) {
seStartSystem(Z2SE_SUBJ_VIEW_OUT);
}
@@ -4537,7 +4537,7 @@ int daAlink_c::procCoSubjectivity() {
return 1;
}
if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(HAWK_EYE))) {
if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE))) {
seStartSystem(Z2SE_SUBJ_VIEW_OUT);
checkWaitAction();
} else if (!checkWolf() && (checkItemAction() || checkItemChangeFromButton())) {
@@ -4994,7 +4994,7 @@ extern "C" s32 getItemID__9daAlink_cCFv(daAlink_c* this_) {
/* 800D0370-800D038C 0CACB0 001C+00 1/0 0/0 0/0 .text getGrabActorID__9daAlink_cCFv */
extern "C" s32 getGrabActorID__9daAlink_cCFv(daAlink_c* this_) {
if (this_->mEquipItem == noentry71) {
if (this_->mEquipItem == 0x102) {
return this_->mItemAcKeep.getID();
} else {
return this_->mGrabItemAcKeep.getID();
@@ -5063,7 +5063,7 @@ extern "C" BOOL checkElecDamage__9daAlink_cCFv(daAlink_c* this_) {
/* 800D04CC-800D04F4 0CAE0C 0028+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daAlink_cCFv */
extern "C" BOOL checkEmptyBottleSwing__9daAlink_cCFv(daAlink_c* this_) {
return this_->mEquipItem == EMPTY_BOTTLE && this_->mProcID == daAlink_c::PROC_BOTTLE_SWING;
return this_->mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE && this_->mProcID == daAlink_c::PROC_BOTTLE_SWING;
}
/* 800D04F4-800D0508 0CAE34 0014+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daAlink_cCFv
@@ -5233,7 +5233,7 @@ extern "C" void onSceneChangeDead__9daAlink_cFUci(daAlink_c* this_, u8 param_0,
/* 800D084C-800D0860 0CB18C 0014+00 1/0 0/0 0/0 .text checkNoEquipItem__9daAlink_cCFv */
extern "C" bool checkNoEquipItem__9daAlink_cCFv(daAlink_c* this_) {
return this_->mEquipItem == NO_ITEM;
return this_->mEquipItem == fpcNm_ITEM_NONE;
}
/* 800D0860-800D087C 0CB1A0 001C+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daAlink_cCFv
@@ -5318,7 +5318,7 @@ extern "C" void setSumouGraspCancelCount__9daAlink_cFi(daAlink_c* this_, int par
/* 800D0998-800D09AC 0CB2D8 0014+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daAlink_cCFv
*/
extern "C" bool checkItemSwordEquip__9daAlink_cCFv(daAlink_c* this_) {
return this_->mEquipItem == EQUIP_SWORD;
return this_->mEquipItem == 0x103;
}
/* 800D09AC-800D09B4 0CB2EC 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daAlink_cCFv
@@ -5365,7 +5365,7 @@ extern "C" void getMidnaAtnPos__9daAlink_cCFv() {
/* 800D0A30-800D0A44 0CB370 0014+00 1/0 0/0 0/0 .text checkCopyRodEquip__9daAlink_cCFv */
extern "C" bool checkCopyRodEquip__9daAlink_cCFv(daAlink_c* this_) {
return this_->mEquipItem == COPY_ROD;
return this_->mEquipItem == fpcNm_ITEM_COPY_ROD;
}
/* 800D0A44-800D0A6C 0CB384 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daAlink_cCFv */
src/d/actor/d_a_alink_spinner.inc
+2 -2
View File
@@ -218,7 +218,7 @@ int daAlink_c::procSpinnerWait() {
return procSmallJumpInit(2);
}
int itemSetBtn = checkItemSetButton(SPINNER);
int itemSetBtn = checkItemSetButton(fpcNm_ITEM_SPINNER);
if (mProcVar2.field_0x300c == 0) {
if (!itemButton()) {
mProcVar2.field_0x300c = 1;
@@ -238,7 +238,7 @@ int daAlink_c::procSpinnerWait() {
mProcVar3.field_0x300e = shape_angle.y;
}
} else {
if (checkSetItemTrigger(SPINNER) || swordSwingTrigger() || itemSetBtn == 2) {
if (checkSetItemTrigger(fpcNm_ITEM_SPINNER) || swordSwingTrigger() || itemSetBtn == 2) {
if (swordSwingTrigger()) {
swordEquip(0);
}
src/d/actor/d_a_alink_swim.inc
+4 -4
View File
@@ -15,7 +15,7 @@ BOOL daAlink_c::checkZoraWearMaskDraw() {
/* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */
BOOL daAlink_c::checkAcceptUseItemInWater(u16 i_itemNo) const {
return i_itemNo == HVY_BOOTS || i_itemNo == WATER_BOMB || checkHookshotItem(i_itemNo);
return i_itemNo == fpcNm_ITEM_HVY_BOOTS || i_itemNo == fpcNm_ITEM_WATER_BOMB || checkHookshotItem(i_itemNo);
}
/* 80101934-801019B8 0FC274 0084+00 4/4 0/0 0/0 .text swimDeleteItem__9daAlink_cFv */
@@ -786,7 +786,7 @@ void daAlink_c::setSwimMoveAnime() {
if (checkBootsOrArmorHeavy()) {
var_r29 = ANM_SWIM_WAIT;
field_0x594 = daAlinkHIO_swim_c0::m.mUnderwaterMaxSinkSpeed;
if (mEquipItem != NO_ITEM && !checkHookshotAnime()) {
if (mEquipItem != fpcNm_ITEM_NONE && !checkHookshotAnime()) {
setDoStatus(4);
}
}
@@ -958,7 +958,7 @@ int daAlink_c::procSwimUp() {
setNormalSpeedF(0.0f, daAlinkHIO_swim_c0::m.mDeceleration);
if (checkSetItemTrigger(HVY_BOOTS)) {
if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) {
setHeavyBoots(1);
}
@@ -1053,7 +1053,7 @@ int daAlink_c::procSwimWait() {
setSwimUpDownOffset();
if (checkEquipHeavyBoots() && mEquipItem != NO_ITEM) {
if (checkEquipHeavyBoots() && mEquipItem != fpcNm_ITEM_NONE) {
setDoStatus(0x4);
}
src/d/actor/d_a_alink_swindow.inc
+2 -2
View File
@@ -22,11 +22,11 @@ void daAlink_c::setArcName(BOOL i_isWolf) {
}
inline bool checkCarvingWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == WOOD_SHIELD;
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD;
}
inline bool checkShopWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == SHIELD;
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD;
}
/* 8013FF90-8013FFD8 13A8D0 0048+00 2/2 0/0 0/0 .text setShieldArcName__9daAlink_cFv */
src/d/actor/d_a_alink_weakfn.inc
+1 -1
View File
@@ -140,7 +140,7 @@ extern "C" void offCondition__11dEvt_info_cFUs() {
/* 80141210-80141230 13BB50 0020+00 1/1 0/0 0/0 .text checkShieldGet__9daPy_py_cFv */
extern "C" BOOL checkShieldGet__9daPy_py_cFv() {
return dComIfGs_getSelectEquipShield() != NO_ITEM;
return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE;
}
/* 80141230-80141264 13BB70 0034+00 1/1 0/0 0/0 .text fopAcM_onSwitch__FPC10fopAc_ac_ci
src/d/actor/d_a_alink_whistle.inc
+4 -4
View File
@@ -55,13 +55,13 @@ void daAlink_c::setHorseWhistleModel() {
mHeldItemModel = initModel(loadAramBmd(0x31A, 0x3000), 0);
mDoExt_setCurrentHeap(prev_heap);
mEquipItem = HORSE_FLUTE;
mEquipItem = fpcNm_ITEM_HORSE_FLUTE;
field_0x2f94 = 2;
}
/* 80111894-801119D8 10C1D4 0144+00 2/2 0/0 0/0 .text procGrassWhistleGetInit__9daAlink_cFv */
int daAlink_c::procGrassWhistleGetInit() {
if (mEquipItem != NO_ITEM) {
if (mEquipItem != fpcNm_ITEM_NONE) {
return procPreActionUnequipInit(PROC_GRASS_WHISTLE_GET, field_0x27f4);
}
@@ -95,7 +95,7 @@ int daAlink_c::procGrassWhistleGet() {
if (frameCtrl_p->checkAnmEnd()) {
procGrassWhistleWaitInit(mProcVar2.field_0x300c, mProcVar3.field_0x300e,
mProcVar4.field_0x3010, mProcVar5.field_0x3012, &field_0x37c8);
} else if (mEquipItem == NO_ITEM && frameCtrl_p->getFrame() >= 9.0f) {
} else if (mEquipItem == fpcNm_ITEM_NONE && frameCtrl_p->getFrame() >= 9.0f) {
setGrassWhistleModel(mProcVar2.field_0x300c);
if (field_0x280c.getActor() != NULL) {
@@ -133,7 +133,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
field_0x32cc = 0x532;
} else {
setSingleAnimeBase(ANM_WAIT);
mKeepItem = NO_ITEM;
mKeepItem = fpcNm_ITEM_NONE;
if (param_0 == 0) {
field_0x3198 = 0x100;
src/d/actor/d_a_alink_wolf.inc
+10 -10
View File
@@ -9453,21 +9453,21 @@ int daAlink_c::procWolfDigThrough() {
/* 8013F90C-8013FA14 13A24C 0108+00 1/1 0/0 0/0 .text setSmellSave__9daAlink_cFv */
void daAlink_c::setSmellSave() {
if (dComIfGs_getCollectSmell() == SMELL_MEDICINE) {
if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE) {
dComIfGs_offEventBit(0x2F04); // OFF: Got Medicine Scent
}
dMsgObject_setSmellType(mProcVar5.field_0x3012);
if (mProcVar5.field_0x3012 == SMELL_MEDICINE) {
if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_MEDICINE) {
dComIfGs_onEventBit(0x2F04); // ON: Got Medicine Scent
} else if (mProcVar5.field_0x3012 == SMELL_CHILDREN) {
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) {
fopAcM_onSwitch(this, 102);
} else if (mProcVar5.field_0x3012 == SMELL_YELIA_POUCH) {
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) {
fopAcM_onSwitch(this, 103);
} else if (mProcVar5.field_0x3012 == SMELL_FISH) {
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_FISH) {
dComIfGs_onEventBit(0x6120); // ON: Got Reekfish scent
} else if (mProcVar5.field_0x3012 == SMELL_POH) {
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_POH) {
dComIfGs_onEventBit(0x6210); // ON: Got Poe scent
}
@@ -9502,7 +9502,7 @@ int daAlink_c::procWolfGetSmellInit() {
dComIfGp_setPlayerStatus1(0, 0x4000000);
mProcVar2.field_0x300c = 0;
if (dComIfGs_getCollectSmell() == NO_ITEM) {
if (dComIfGs_getCollectSmell() == fpcNm_ITEM_NONE) {
field_0x3198 = 0xBBC;
} else {
field_0x3198 = 0xBBB;
@@ -9510,9 +9510,9 @@ int daAlink_c::procWolfGetSmellInit() {
field_0x319c = -1;
if (mProcVar5.field_0x3012 == SMELL_YELIA_POUCH) {
if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) {
field_0x319c = 0x2220;
} else if (mProcVar5.field_0x3012 == SMELL_CHILDREN) {
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) {
field_0x319c = 0x2240;
}
@@ -9536,7 +9536,7 @@ int daAlink_c::procWolfGetSmell() {
dComIfGp_getEvent().reset(this);
dComIfGp_clearPlayerStatus1(0, 0x4000000);
if (mProcVar5.field_0x3012 == SMELL_YELIA_POUCH) {
if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) {
fopAcM_orderOtherEvent(this, "SMELL_1st", 0xFFFF, 0x400, 1);
} else {
fopAcM_orderOtherEvent(this, "SMELL_Child", 0xFFFF, 0x400, 1);
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -500,7 +500,7 @@ void daArrow_c::setBombMoveEffect() {
bool daArrow_c::checkReget() {
if (field_0x7cc.ChkCoHit()) {
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, ARROW_1, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, 0.0f);
mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, 0, 0, 0);
field_0x93f = 1;
return true;
src/d/actor/d_a_b_bq.cpp
+2 -2
View File
@@ -1932,7 +1932,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, UTAWA_HEART,
fopAcM_createItemForBoss(&i_this->field_0x5cc, fpcNm_ITEM_UTAWA_HEART,
fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &sp120,
0.0f, 0.0f, -1);
@@ -2510,7 +2510,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, UTAWA_HEART, fopAcM_GetRoomNo(i_this),
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this),
&i_this->shape_angle, &scale, 0.0f, 0.0f, -1);
}
src/d/actor/d_a_b_ds.cpp
+1 -1
View File
@@ -5697,7 +5697,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, UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &scale,
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &scale,
0.0f, 0.0f, -1);
}
src/d/actor/d_a_b_ob.cpp
+2 -2
View File
@@ -3015,7 +3015,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, UTAWA_HEART, fopAcM_GetRoomNo(a_this), &sp17C,
fopAcM_createItemForBoss(&a_this->eyePos, fpcNm_ITEM_UTAWA_HEART, 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));
}
@@ -3869,7 +3869,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, UTAWA_HEART, fopAcM_GetRoomNo(a_this),
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this),
&a_this->shape_angle, &scale, 0.0f, 0.0f, -1);
}
src/d/actor/d_a_b_yo_ice.cpp
+2 -2
View File
@@ -165,7 +165,7 @@ void daB_YOI_c::damage_check() {
if (pos.y < 50.0f) {
pos.y = 50.0f;
}
fopAcM_createItem(&pos, HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
}
}
}
@@ -205,7 +205,7 @@ void daB_YOI_c::setOperate(int param_0) {
if (pos.y < 50.0f) {
pos.y = 50.0f;
}
fopAcM_createItem(&pos, HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
}
break;
case 8:
src/d/actor/d_a_demo_item.cpp
+17 -17
View File
@@ -75,11 +75,11 @@ void daDitem_c::actionStart() {
OS_REPORT("ゲットアイテム：エフェクトライトセット＆表示スタート！\n");
}
if (m_itemNo == DUNGEON_EXIT || m_itemNo == DUNGEON_EXIT_2) {
if (m_itemNo == fpcNm_ITEM_DUNGEON_EXIT || m_itemNo == fpcNm_ITEM_DUNGEON_EXIT_2) {
current.angle.y = dComIfGp_getPlayer(0)->shape_angle.y;
}
if (m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART) {
if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
JPABaseEmitter* emitter = field_0x96c.getEmitter();
if (emitter == NULL) {
dComIfGp_particle_set(0x8DE, &current.pos, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL);
@@ -93,22 +93,22 @@ void daDitem_c::actionStart() {
mParticleAlpha = 0xFF;
}
if ((m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) && field_0x96c.getEmitter() == NULL) {
if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && 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 == WALLET_LV3 && field_0x96c.getEmitter() == NULL) {
if (m_itemNo == fpcNm_ITEM_WALLET_LV3 && 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 == CHUCHU_RARE && field_0x96c.getEmitter() == NULL) {
if (m_itemNo == fpcNm_ITEM_CHUCHU_RARE && 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 == FAIRY_DROP || m_itemNo == DROP_BOTTLE) && field_0x96c.getEmitter() == NULL) {
if ((m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) && field_0x96c.getEmitter() == NULL) {
dComIfGp_particle_set(0x8C15, &field_0x99c, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL);
}
@@ -128,7 +128,7 @@ void daDitem_c::actionEvent() {
cLib_addCalc2(&mLight.mPow, mLightStrength, 0.1f, 1.0f);
}
if (m_itemNo == POU_SPIRIT) {
if (m_itemNo == fpcNm_ITEM_POU_SPIRIT) {
mSound.startLevelSound(Z2SE_EN_PO_SOUL, 0, -1);
}
@@ -137,7 +137,7 @@ void daDitem_c::actionEvent() {
execItemGet(m_itemNo);
}
if (m_itemNo == KAKERA_HEART) {
if (m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0 && room_no == 2) {
@@ -229,7 +229,7 @@ void daDitem_c::actionEvent() {
void daDitem_c::actionWaitLightEnd() {
BOOL particle_hidden = TRUE;
if (m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART) {
if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
particle_hidden = cLib_chaseUC(&mParticleAlpha, 0, 26);
JPABaseEmitter* emitter = field_0x96c.getEmitter();
@@ -402,7 +402,7 @@ void daDitem_c::settingEffectLight() {
void daDitem_c::set_mtx() {
mpModel->setBaseScale(scale);
if (m_itemNo != DUNGEON_EXIT && m_itemNo != DUNGEON_BACK && m_itemNo != LV7_DUNGEON_EXIT && m_itemNo != DUNGEON_EXIT_2) {
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) {
s16 var_r28 = 0xFFFF / 250;
fopAcM_addAngleY(this, current.angle.y + var_r28, var_r28);
}
@@ -440,12 +440,12 @@ int daDitem_c::Delete() {
dKy_efplight_cut(&mLight);
}
if (m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART) {
if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
field_0x96c.remove();
field_0x980.remove();
}
if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE || m_itemNo == WALLET_LV3 || m_itemNo == FAIRY_DROP || m_itemNo == DROP_BOTTLE || m_itemNo == CHUCHU_RARE) {
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) {
field_0x96c.remove();
}
@@ -478,7 +478,7 @@ int daDitem_c::create() {
OS_REPORT_ERROR("ゲット用モデルのアーカイブ名がありません！[%d]\n", m_itemNo);
}
m_itemNo = GREEN_RUPEE;
m_itemNo = fpcNm_ITEM_GREEN_RUPEE;
}
int phase_state = dComIfG_resLoad(&mPhase, dItem_data::getArcName(m_itemNo));
@@ -523,13 +523,13 @@ int daDitem_c::execute() {
eyePos = current.pos;
eyePos.y += mpModel->getModelData()->getJointNodePointer(0)->getMax()->y * 0.5f;
if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) {
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
field_0x99c = current.pos;
field_0x99c.y += 10.0f;
} else if (m_itemNo == WALLET_LV3 || m_itemNo == CHUCHU_RARE) {
} else if (m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) {
field_0x99c = current.pos;
field_0x99c.y += 15.0f;
} else if (m_itemNo == FAIRY_DROP || m_itemNo == DROP_BOTTLE) {
} else if (m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) {
field_0x99c = current.pos;
}
@@ -544,7 +544,7 @@ static int daDitem_Execute(daDitem_c* i_this) {
int daDitem_c::draw() {
switch (m_itemNo) {
case WOOD_STICK:
case fpcNm_ITEM_WOOD_STICK:
draw_WOOD_STICK();
break;
}
src/d/actor/d_a_do.cpp
+4 -4
View File
@@ -1359,15 +1359,15 @@ case1and2:
if (get_item) {
int item_no;
if (dComIfGs_getLife() <= 4) {
item_no = HEART;
item_no = fpcNm_ITEM_HEART;
} else {
int rnd = cM_rndF(11.0f);
if (rnd <= 5) {
item_no = HEART;
item_no = fpcNm_ITEM_HEART;
} else if (rnd <= 9) {
item_no = GREEN_RUPEE;
item_no = fpcNm_ITEM_GREEN_RUPEE;
} else {
item_no = BLUE_RUPEE;
item_no = fpcNm_ITEM_BLUE_RUPEE;
}
}
src/d/actor/d_a_e_arrow.cpp
+2 -2
View File
@@ -387,9 +387,9 @@ static void e_arrow_bg(e_arrow_class* i_this) {
i_this->mMode = 1;
i_this->mTimers[0] = 100;
case 1:
if (checkItemGet(BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) {
if (checkItemGet(fpcNm_ITEM_BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) {
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&i_this->current.pos, ARROW_1, -1, NULL, NULL, 0.0f,
fopAcM_createItemForSimpleDemo(&i_this->current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f,
0.0f);
mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0);
src/d/actor/d_a_e_ba.cpp
+1 -1
View File
@@ -809,7 +809,7 @@ static void action(e_ba_class* i_this) {
if (i_this->mKnockbackSpeed <= 1.0f || i_this->mAcch.ChkWallHit()) {
fopAcM_delete(i_this);
if (i_this->mHomeType == e_ba_class::HOME_APPEAR) {
// should be HEART : ARROW_10 but that gives incorrect code
// should be fpcNm_ITEM_HEART : fpcNm_ITEM_ARROW_10 but that gives incorrect code
int item_no = dComIfGs_getLife() <= 4 ? 0 : 0xE;
fopAcM_createItem(&i_this->current.pos, item_no, -1, -1, NULL, NULL, 0);
fopAcM_createDisappear(i_this, &i_this->current.pos, 6, 0, 0xff);
src/d/actor/d_a_e_fz.cpp
+3 -3
View File
@@ -66,7 +66,7 @@ daE_FZ_HIO_c::daE_FZ_HIO_c() {
/* 806BE9D4-806BEAD8 000174 0104+00 1/1 0/0 0/0 .text draw__8daE_FZ_cFv */
s32 daE_FZ_c::draw() {
if (field_0x714 == 2 && !checkItemGet(IRONBALL,1)) {
if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) {
return 1;
}
@@ -827,7 +827,7 @@ void daE_FZ_c::cc_set() {
/* 806C08C4-806C0B00 002064 023C+00 1/1 0/0 0/0 .text execute__8daE_FZ_cFv */
s32 daE_FZ_c::execute() {
if (field_0x714 == 2) {
if (checkItemGet(IRONBALL,1) == 0) {
if (checkItemGet(fpcNm_ITEM_IRONBALL,1) == 0) {
return 1;
}
@@ -1012,7 +1012,7 @@ s32 daE_FZ_c::create() {
field_0x67c[i].set(current.pos);
}
if (field_0x714 == 2 && !checkItemGet(IRONBALL,1)) {
if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_SetGroup(this,0);
fopAcM_OffStatus(this,0);
src/d/actor/d_a_kytag12.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ static int daKytag12_Draw(kytag12_class* param_0) {
static void daKytag12_light_swprd_proc(kytag12_class* i_this) {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
if (dComIfGs_getSelectEquipSword() == LIGHT_SWORD) {
if (dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD) {
if (player->getCutType() != 0) {
if (i_this->field_0x576 == 0) {
cXyz sp28(player->current.pos);
@@ -878,7 +878,7 @@ static int daKytag12_Execute_R00(kytag12_class* i_this) {
sp80.y = player->current.pos.y;
if (player->current.pos.abs(sp80) < 600.0f &&
dComIfGs_getSelectEquipSword() == LIGHT_SWORD && player->getCutType() != 0 &&
dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD && player->getCutType() != 0 &&
d_kytag12_cut_turn_check())
{
i_this->field_0x575 = 1;
src/d/actor/d_a_npc_ne.cpp
+1 -1
View File
@@ -2993,7 +2993,7 @@ static int message(npc_ne_class* i_this) {
i_this->mIsTalking = 0;
if (i_this->mIsGengle == 1 && (i_this->mMsgFlow.getNowMsgNo() == 0x18a1 ||
i_this->mMsgFlow.getNowMsgNo() == 0x18a2)) {
fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, SILVER_RUPEE, -1,
fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, fpcNm_ITEM_SILVER_RUPEE, -1,
fopAcM_GetRoomNo(i_this), NULL, NULL, 3);
}
}
src/d/actor/d_a_npc_zra.inc
+2 -2
View File
@@ -2400,9 +2400,9 @@ void daNpc_zrA_c::moveRiverPosCalc(cXyz& o_pos) {
void daNpc_zrA_c::createRuppi() {
int item;
if (cLib_getRndValue(0, 5) < 4) {
item = GREEN_RUPEE;
item = fpcNm_ITEM_GREEN_RUPEE;
} else {
item = BLUE_RUPEE;
item = fpcNm_ITEM_BLUE_RUPEE;
}
cXyz pos(0.0f, 0.0f, -100.0f);
mDoMtx_stack_c::transS(current.pos);
src/d/actor/d_a_npc_zrc.cpp
+1 -1
View File
@@ -1179,7 +1179,7 @@ BOOL daNpc_zrC_c::doEvent() {
(this->*mpActionFn)(NULL);
} else if (dComIfGp_event_chkTalkXY()) {
if (dComIfGp_evmng_ChkPresentEnd()) {
if (mType == 2 && dComIfGp_event_getPreItemNo() == ASHS_SCRIBBLING) {
if (mType == 2 && dComIfGp_event_getPreItemNo() == fpcNm_ITEM_ASHS_SCRIBBLING) {
mFlowID = 0x35;
mOrderEvtNo = EVT_EARRING_GET;
changeEvent(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx],
src/d/actor/d_a_obj_drop.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ void daObjDrop_c::dropGet() {
s8 area = dComIfGp_getStartStageDarkArea();
// "Drop of Light No%d<%d/%d> Get Area<%d>!\n"
OS_REPORT("光の雫No%d<%d/%d>ゲットArea<%d>！\n", getSave(), num + 1, need_num, area);
execItemGet(HEART);
execItemGet(fpcNm_ITEM_HEART);
mSetCollectDrop = false;
}
}
src/d/actor/d_a_obj_ice_l.cpp
+1 -1
View File
@@ -441,7 +441,7 @@ int daObjIce_l_c::create() {
}
if (field_0x5b0 != 0) {
if (dComIfGs_getCollectSmell() == SMELL_FISH) {
if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) {
field_0x5b1 = 1;
} else {
field_0x5b1 = 0xFF;
src/d/actor/d_a_obj_ice_s.cpp
+1 -1
View File
@@ -503,7 +503,7 @@ int daObjIce_s_c::create() {
field_0x5c4 = 1;
}
if (field_0x5c4 != 0) {
if (dComIfGs_getCollectSmell() == SMELL_FISH) {
if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) {
field_0x5c5 = 1;
} else {
field_0x5c5 = 0xff;
src/d/actor/d_a_obj_item.cpp
+85 -85
View File
@@ -68,13 +68,13 @@ void daItem_c::setBaseMtx() {
mpModel->setBaseScale(scale);
switch (m_itemNo) {
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case SILVER_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
setBaseMtx_1();
break;
default:
@@ -223,9 +223,9 @@ void daItem_c::CreateInit() {
initBaseMtx();
animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
if (m_itemNo == BOOMERANG) {
if (m_itemNo == fpcNm_ITEM_BOOMERANG) {
itemGetNextExecute();
} else if ((m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) &&
} else if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) &&
mSparkleEmtr.getEmitter() == NULL)
{
dComIfGp_particle_set(0x0C14, &mSparklePos, NULL, NULL, -1, &mSparkleEmtr, -1, NULL, NULL,
@@ -296,15 +296,15 @@ int daItem_c::_daItem_create() {
return cPhs_ERROR_e;
}
if (m_itemNo == SMALL_KEY || m_itemNo == KANTERA || m_itemNo == LIGHT_DROP ||
m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART)
if (m_itemNo == fpcNm_ITEM_SMALL_KEY || m_itemNo == fpcNm_ITEM_KANTERA || m_itemNo == fpcNm_ITEM_LIGHT_DROP ||
m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART)
{
// "fpcNm_(ITEM) is an unhandled item<%d>\n"
// "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n"
OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo);
JUT_ASSERT(0);
return cPhs_ERROR_e;
} else if (m_itemNo == BOMB_5 || m_itemNo == BOMB_10 || m_itemNo == BOMB_20 ||
m_itemNo == BOMB_30)
} else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 ||
m_itemNo == fpcNm_ITEM_BOMB_30)
{
// "Bomb Replenish Items are no longer in use!\n"
OS_REPORT_ERROR("補給アイテムの爆弾は使用不可になりました！\n");
@@ -391,7 +391,7 @@ int daItem_c::_daItem_execute() {
mLastPos = current.pos;
field_0x95f = (fopAcM_checkHookCarryNow(this) >> 0x14) & 1;
if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) {
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
mSparklePos = current.pos;
mSparklePos.y += 18.0f;
}
@@ -416,7 +416,7 @@ int daItem_c::_daItem_draw() {
int daItem_c::_daItem_delete() {
mSound.deleteObject();
if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) {
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
mSparkleEmtr.remove();
}
@@ -523,7 +523,7 @@ void daItem_c::procMainSimpleGetDemo() {
void daItem_c::procInitGetDemoEvent() {
hide();
if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) {
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
mSparkleEmtr.remove();
}
@@ -547,7 +547,7 @@ void daItem_c::procWaitGetDemoEvent() {
dComIfGp_event_setItemPartnerId(m_item_id);
}
} else {
if (m_itemNo == BOOMERANG) {
if (m_itemNo == fpcNm_ITEM_BOOMERANG) {
fopAcM_orderItemEvent(this, 0, 0);
eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
return;
@@ -784,27 +784,27 @@ void daItem_c::mode_wait() {
}
switch (m_itemNo) {
case HEART:
case fpcNm_ITEM_HEART:
itemActionForHeart();
break;
case ARROW_10:
case ARROW_20:
case ARROW_30:
case ARROW_1:
case PACHINKO_SHOT:
case LIGHT_ARROW:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case fpcNm_ITEM_PACHINKO_SHOT:
case fpcNm_ITEM_LIGHT_ARROW:
itemActionForArrow();
break;
case BOOMERANG:
case fpcNm_ITEM_BOOMERANG:
itemActionForBoomerang();
break;
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case SILVER_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
default:
itemActionForRupee();
break;
@@ -829,24 +829,24 @@ void daItem_c::mode_water() {
f32 scale = 1.0f;
switch (m_itemNo) {
case HEART:
case fpcNm_ITEM_HEART:
scale = 0.5f;
break;
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
scale = 1.0f;
break;
case ARROW_10:
case ARROW_20:
case ARROW_30:
case ARROW_1:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
scale = 1.0f;
break;
case PACHINKO_SHOT:
case fpcNm_ITEM_PACHINKO_SHOT:
scale = 1.0f;
break;
}
@@ -868,22 +868,22 @@ void daItem_c::itemGetNextExecute() {
BOOL haveItem = false;
switch (m_itemNo) {
case HEART:
case GREEN_RUPEE:
case ARROW_10:
case ARROW_20:
case ARROW_30:
case ARROW_1:
case fpcNm_ITEM_HEART:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
procInitSimpleGetDemo();
itemGet();
break;
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case SILVER_RUPEE:
case PACHINKO_SHOT:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
case fpcNm_ITEM_PACHINKO_SHOT:
if (daPy_getPlayerActorClass()->checkCanoeRide() ||
daPy_getPlayerActorClass()->checkHorseRide())
{
@@ -903,7 +903,7 @@ void daItem_c::itemGetNextExecute() {
itemGet();
}
break;
case BOOMERANG:
case fpcNm_ITEM_BOOMERANG:
procInitGetDemoEvent();
break;
default:
@@ -922,45 +922,45 @@ void daItem_c::itemGetNextExecute() {
/* 8015D0A8-8015D370 1579E8 02C8+00 2/2 0/0 0/0 .text itemGet__8daItem_cFv */
void daItem_c::itemGet() {
switch (m_itemNo) {
case HEART:
case fpcNm_ITEM_HEART:
mDoAud_seStart(Z2SE_HEART_PIECE_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case GREEN_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
mDoAud_seStart(Z2SE_GREEN_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case BLUE_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case YELLOW_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case RED_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case PURPLE_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case ORANGE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case SILVER_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0);
execItemGet(m_itemNo);
break;
case BOOMERANG:
case fpcNm_ITEM_BOOMERANG:
break;
case ARROW_10:
case ARROW_20:
case ARROW_30:
case ARROW_1:
case PACHINKO_SHOT:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case fpcNm_ITEM_PACHINKO_SHOT:
mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0);
execItemGet(m_itemNo);
default:
@@ -1123,19 +1123,19 @@ void daItem_c::set_bound_se() {
}
switch (m_itemNo) {
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
fopAcM_seStart(this, Z2SE_OBJ_LUPY_BOUND, var_r31);
break;
case ARROW_10:
case ARROW_20:
case ARROW_30:
case ARROW_1:
case LIGHT_ARROW:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case fpcNm_ITEM_LIGHT_ARROW:
fopAcM_seStart(this, Z2SE_OBJ_ARROW_BOUND, var_r31);
break;
}
@@ -1284,7 +1284,7 @@ void daItem_c::initSpeed(BOOL i_noTypeChk) {
u8 type = daItem_prm::getType(this);
if (!i_noTypeChk) {
if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == BOOMERANG) {
if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == fpcNm_ITEM_BOOMERANG) {
y_speed = 0.0f;
speedf = 0.0f;
} else if (type == TYPE_LAUNCH_NO_RND_e || type == TYPE_FIXED_PLACE_e) {
src/d/actor/d_a_obj_kiPot.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ void daKiPot_c::init_modeWait() {
/* 80C44F80-80C45008 000360 0088+00 1/0 0/0 0/0 .text modeWait__9daKiPot_cFv */
void daKiPot_c::modeWait() {
if (chkEvent() && eventInfo.i_checkCommandCatch() == 0) {
dComIfGp_att_CatchRequest(this, UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1);
dComIfGp_att_CatchRequest(this, fpcNm_ITEM_UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1);
eventInfo.i_onCondition(0x40);
}
}
src/d/actor/d_a_obj_lv4digsand.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ int daObjL4DigSand_c::create1st() {
/* 80C66D40-80C66DD0 0002A0 0090+00 1/0 0/0 0/0 .text Execute__16daObjL4DigSand_cFPPA3_A4_f */
int daObjL4DigSand_c::Execute(f32 (**param_0)[3][4]) {
if (daPy_py_c::i_checkNowWolf() && checkItemGet(SMELL_POH, 1)) {
if (daPy_py_c::i_checkNowWolf() && checkItemGet(fpcNm_ITEM_SMELL_POH, 1)) {
attention_info.flags = 0x80;
} else {
attention_info.flags = 0;
src/d/actor/d_a_obj_master_sword.cpp
+4 -4
View File
@@ -143,7 +143,7 @@ void daObjMasterSword_c::executeWait() {
}
if (fopAcM_checkCarryNow(this)) {
dMeter2Info_setCloth(WEAR_KOKIRI, false);
dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false);
fopAcM_orderMapToolEvent(this, getEventID(), 0xFF, 0xFFFF, 1, 0);
}
}
@@ -548,9 +548,9 @@ int daObjMasterSword_c::execute() {
mBrk.play();
if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) {
dComIfGs_onItemFirstBit(MASTER_SWORD);
dMeter2Info_setSword(MASTER_SWORD, false);
dComIfGs_setSelectEquipSword(MASTER_SWORD);
dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD);
dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false);
dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD);
dComIfGp_setItemLifeCount(dComIfGs_getMaxLife(), 0);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()]);
src/d/actor/d_a_obj_oiltubo.cpp
+1 -1
View File
@@ -289,7 +289,7 @@ int daObj_Oiltubo_c::wait(void* unused) {
switch (mMode) {
case 1:
if (!eventInfo.i_checkCommandCatch()) {
dComIfGp_att_CatchRequest(this, OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1);
dComIfGp_att_CatchRequest(this, fpcNm_ITEM_OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1);
eventInfo.i_onCondition(0x40);
}
break;
src/d/actor/d_a_obj_swBallC.cpp
+1 -1
View File
@@ -274,7 +274,7 @@ int daObjSwBallC_c::demoProc() {
break;
case 10:
field_0x584 = 1;
execItemGet(LIGHT_SWORD);
execItemGet(fpcNm_ITEM_LIGHT_SWORD);
break;
}
}
src/d/actor/d_a_player.cpp
+20 -20
View File
@@ -145,63 +145,63 @@ u32 daPy_py_c::setParamData(int param_0, int param_1, int param_2, int param_3)
/* 8015EA20-8015EA48 159360 0028+00 0/0 10/10 3/3 .text checkFishingRodItem__9daPy_py_cFi
*/
BOOL daPy_py_c::checkFishingRodItem(int i_itemNo) {
return i_itemNo == FISHING_ROD_1 || (i_itemNo >= BEE_ROD && i_itemNo <= JEWEL_WORM_ROD);
return i_itemNo == fpcNm_ITEM_FISHING_ROD_1 || (i_itemNo >= fpcNm_ITEM_BEE_ROD && i_itemNo <= fpcNm_ITEM_JEWEL_WORM_ROD);
}
/* 8015EA48-8015EA88 159388 0040+00 0/0 3/3 0/0 .text checkBombItem__9daPy_py_cFi */
BOOL daPy_py_c::checkBombItem(int i_itemNo) {
return i_itemNo == NORMAL_BOMB || i_itemNo == WATER_BOMB || i_itemNo == POKE_BOMB;
return i_itemNo == fpcNm_ITEM_NORMAL_BOMB || i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB;
}
/* 8015EA88-8015EAD8 1593C8 0050+00 0/0 5/5 0/0 .text checkBottleItem__9daPy_py_cFi */
BOOL daPy_py_c::checkBottleItem(int i_itemNo) {
return (i_itemNo >= EMPTY_BOTTLE && i_itemNo <= FAIRY) || i_itemNo == BEE_CHILD ||
i_itemNo == WORM || i_itemNo == FAIRY_DROP || i_itemNo == CHUCHU_BLACK ||
(i_itemNo >= CHUCHU_RARE && i_itemNo <= LV3_SOUP);
return (i_itemNo >= fpcNm_ITEM_EMPTY_BOTTLE && i_itemNo <= fpcNm_ITEM_FAIRY) || i_itemNo == fpcNm_ITEM_BEE_CHILD ||
i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY_DROP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK ||
(i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo <= fpcNm_ITEM_LV3_SOUP);
}
/* 8015EAD8-8015EB40 159418 0068+00 0/0 3/3 0/0 .text checkDrinkBottleItem__9daPy_py_cFi
*/
BOOL daPy_py_c::checkDrinkBottleItem(int i_itemNo) {
return (i_itemNo >= RED_BOTTLE && i_itemNo <= HALF_MILK_BOTTLE) || i_itemNo == RED_BOTTLE_2 ||
i_itemNo == UGLY_SOUP || i_itemNo == HOT_SPRING || i_itemNo == BEE_CHILD ||
i_itemNo == CHUCHU_BLACK || i_itemNo == FAIRY_DROP ||
(i_itemNo >= CHUCHU_RARE && i_itemNo != CHUCHU_YELLOW && i_itemNo <= LV3_SOUP);
return (i_itemNo >= fpcNm_ITEM_RED_BOTTLE && i_itemNo <= fpcNm_ITEM_HALF_MILK_BOTTLE) || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2 ||
i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_HOT_SPRING || i_itemNo == fpcNm_ITEM_BEE_CHILD ||
i_itemNo == fpcNm_ITEM_CHUCHU_BLACK || i_itemNo == fpcNm_ITEM_FAIRY_DROP ||
(i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo != fpcNm_ITEM_CHUCHU_YELLOW && i_itemNo <= fpcNm_ITEM_LV3_SOUP);
}
/* 8015EB40-8015EB68 159480 0028+00 0/0 4/4 0/0 .text checkOilBottleItem__9daPy_py_cFi */
BOOL daPy_py_c::checkOilBottleItem(int i_itemNo) {
return i_itemNo == CHUCHU_YELLOW || i_itemNo == OIL_BOTTLE_2 || i_itemNo == OIL_BOTTLE;
return i_itemNo == fpcNm_ITEM_CHUCHU_YELLOW || i_itemNo == fpcNm_ITEM_OIL_BOTTLE_2 || i_itemNo == fpcNm_ITEM_OIL_BOTTLE;
}
/* 8015EB68-8015EB90 1594A8 0028+00 0/0 2/2 0/0 .text checkOpenBottleItem__9daPy_py_cFi
*/
BOOL daPy_py_c::checkOpenBottleItem(int i_itemNo) {
return i_itemNo == WATER_BOTTLE || i_itemNo == WORM || i_itemNo == FAIRY;
return i_itemNo == fpcNm_ITEM_WATER_BOTTLE || i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY;
}
/* 8015EB90-8015EBB8 1594D0 0028+00 0/0 11/11 0/0 .text checkBowItem__9daPy_py_cFi */
BOOL daPy_py_c::checkBowItem(int i_itemNo) {
return i_itemNo == BOW || i_itemNo == BOMB_ARROW || i_itemNo == HAWK_ARROW;
return i_itemNo == fpcNm_ITEM_BOW || i_itemNo == fpcNm_ITEM_BOMB_ARROW || i_itemNo == fpcNm_ITEM_HAWK_ARROW;
}
/* 8015EBB8-8015EBD8 1594F8 0020+00 0/0 23/23 0/0 .text checkHookshotItem__9daPy_py_cFi
*/
BOOL daPy_py_c::checkHookshotItem(int i_itemNo) {
return i_itemNo == HOOKSHOT || i_itemNo == W_HOOKSHOT;
return i_itemNo == fpcNm_ITEM_HOOKSHOT || i_itemNo == fpcNm_ITEM_W_HOOKSHOT;
}
/* 8015EBD8-8015EC28 159518 0050+00 0/0 3/3 0/0 .text checkTradeItem__9daPy_py_cFi */
BOOL daPy_py_c::checkTradeItem(int i_itemNo) {
return (i_itemNo >= LETTER && i_itemNo <= IRIAS_PENDANT) || i_itemNo == ANCIENT_DOCUMENT ||
i_itemNo == AIR_LETTER || i_itemNo == ANCIENT_DOCUMENT2 || i_itemNo == RAFRELS_MEMO ||
i_itemNo == TKS_LETTER || i_itemNo == ASHS_SCRIBBLING;
return (i_itemNo >= fpcNm_ITEM_LETTER && i_itemNo <= fpcNm_ITEM_IRIAS_PENDANT) || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT ||
i_itemNo == fpcNm_ITEM_AIR_LETTER || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2 || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO ||
i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING;
}
/* 8015EC28-8015EC48 159568 0020+00 0/0 2/2 0/0 .text checkDungeonWarpItem__9daPy_py_cFi
*/
BOOL daPy_py_c::checkDungeonWarpItem(int i_itemNo) {
return i_itemNo == DUNGEON_EXIT || i_itemNo == DUNGEON_BACK;
return i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_DUNGEON_BACK;
}
/* 8015EC48-8015ECB8 159588 0070+00 0/0 10/10 3/3 .text setActor__16daPy_actorKeep_cFv */
@@ -445,7 +445,7 @@ BOOL daPy_py_c::checkMasterSwordEquip() {
u32 equipSword = dComIfGs_getSelectEquipSword();
bool isMasterSword = false;
if (equipSword == MASTER_SWORD || equipSword == LIGHT_SWORD) {
if (equipSword == fpcNm_ITEM_MASTER_SWORD || equipSword == fpcNm_ITEM_LIGHT_SWORD) {
isMasterSword = true;
}
@@ -457,7 +457,7 @@ BOOL daPy_py_c::checkMasterSwordEquip() {
BOOL daPy_py_c::checkWoodShieldEquip() {
u16 equipShield = dComIfGs_getSelectEquipShield();
return equipShield == WOOD_SHIELD || equipShield == SHIELD;
return equipShield == fpcNm_ITEM_WOOD_SHIELD || equipShield == fpcNm_ITEM_SHIELD;
}
BOOL daPy_py_c::checkNowWolf() {
@@ -651,4 +651,4 @@ int daPy_addCalcShort(s16* i_value, s16 i_target, s16 i_scale, s16 i_maxStep, s1
}
}
return i_target - *i_value;
}
}
src/d/actor/d_a_shop_item.cpp
+29 -29
View File
@@ -10,75 +10,75 @@
/* 8059E9B8-8059EC04 000078 024C+00 2/2 0/0 0/0 .text getShopArcname__12daShopItem_cFv */
const char* daShopItem_c::getShopArcname() {
switch (m_itemNo) {
case NO_ITEM:
case fpcNm_ITEM_NONE:
if (strcmp("R_SP160", dComIfGp_getStartStageName()) == 0) {
mShopItemID = SHOP_ITEMNO_ARMOR_SOLD;
} else {
mShopItemID = SHOP_ITEMNO_SOLD;
}
break;
case OIL_BOTTLE:
case fpcNm_ITEM_OIL_BOTTLE:
mShopItemID = SHOP_ITEMNO_OIL;
break;
case MILK_BOTTLE:
case fpcNm_ITEM_MILK_BOTTLE:
mShopItemID = SHOP_ITEMNO_MILK;
break;
case HALF_MILK_BOTTLE:
case fpcNm_ITEM_HALF_MILK_BOTTLE:
mShopItemID = SHOP_ITEMNO_HALF_MILK;
break;
case RED_BOTTLE:
case fpcNm_ITEM_RED_BOTTLE:
mShopItemID = SHOP_ITEMNO_RED;
break;
case GREEN_BOTTLE:
case fpcNm_ITEM_GREEN_BOTTLE:
mShopItemID = SHOP_ITEMNO_GREEN;
break;
case BLUE_BOTTLE:
case fpcNm_ITEM_BLUE_BOTTLE:
mShopItemID = SHOP_ITEMNO_BLUE;
break;
case DROP_BOTTLE:
case fpcNm_ITEM_DROP_BOTTLE:
mShopItemID = SHOP_ITEMNO_DROP;
break;
case ARROW_10:
case ARROW_20:
case ARROW_30:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
mShopItemID = SHOP_ITEMNO_ARROW;
break;
case SHIELD:
case fpcNm_ITEM_SHIELD:
mShopItemID = SHOP_ITEMNO_SHIELD_B;
break;
case HYLIA_SHIELD:
case fpcNm_ITEM_HYLIA_SHIELD:
mShopItemID = SHOP_ITEMNO_SHIELD_A;
break;
case NORMAL_BOMB:
case BOMB_5:
case BOMB_10:
case BOMB_20:
case BOMB_30:
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_BOMB_5:
case fpcNm_ITEM_BOMB_10:
case fpcNm_ITEM_BOMB_20:
case fpcNm_ITEM_BOMB_30:
mShopItemID = SHOP_ITEMNO_BOMB;
break;
case WATER_BOMB:
case fpcNm_ITEM_WATER_BOMB:
mShopItemID = SHOP_ITEMNO_WATER_BOMB;
break;
case POKE_BOMB:
case fpcNm_ITEM_POKE_BOMB:
mShopItemID = SHOP_ITEMNO_POKE_BOMB;
break;
case BOMB_BAG_LV1:
case BOMB_IN_BAG:
case fpcNm_ITEM_BOMB_BAG_LV1:
case fpcNm_ITEM_BOMB_IN_BAG:
mShopItemID = SHOP_ITEMNO_BOMB_BAG;
break;
case BOMB_BAG_LV2:
case fpcNm_ITEM_BOMB_BAG_LV2:
mShopItemID = SHOP_ITEMNO_BOMB_BAG_LV2;
break;
case BEE_CHILD:
case fpcNm_ITEM_BEE_CHILD:
mShopItemID = SHOP_ITEMNO_BEE_CHILD;
break;
case PACHINKO:
case fpcNm_ITEM_PACHINKO:
mShopItemID = SHOP_ITEMNO_PACHINKO;
break;
case HAWK_EYE:
case fpcNm_ITEM_HAWK_EYE:
mShopItemID = SHOP_ITEMNO_HAWKEYE;
break;
case ARMOR:
case fpcNm_ITEM_ARMOR:
mShopItemID = SHOP_ITEMNO_ARMOR;
break;
default:
@@ -185,7 +185,7 @@ void daShopItem_c::setListStart() {}
/* 8059EFA0-8059F024 000660 0084+00 1/0 0/0 0/0 .text setShadow__12daShopItem_cFv */
void daShopItem_c::setShadow() {
if (m_itemNo != NO_ITEM) {
if (m_itemNo != fpcNm_ITEM_NONE) {
daItemBase_c::setShadow();
} else {
mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, &current.pos, 80.0f, 0.0f,
@@ -234,7 +234,7 @@ int daShopItem_c::_create() {
if (getShopArcname() == NULL) {
// "Display model archive name doesn't exist![%d]\n"
OS_REPORT("陳列用モデルのアーカイブ名がありません！[%d]\n", m_itemNo);
m_itemNo = NO_ITEM;
m_itemNo = fpcNm_ITEM_NONE;
}
int phase_state = dComIfG_resLoad(&mPhase, getShopArcname());
src/d/actor/d_a_tag_bottle_item.cpp
+7 -7
View File
@@ -130,15 +130,15 @@ s32 daTag_BottleItem_c::chkEvent() {
s32 daTag_BottleItem_c::orderEvent() {
makeSoup();
if (!daPy_py_c::i_checkNowWolf() && mBottleItemType != EMPTY_BOTTLE) {
if (!daPy_py_c::i_checkNowWolf() && mBottleItemType != fpcNm_ITEM_EMPTY_BOTTLE) {
attention_info.flags = 0x20000008;
} else {
attention_info.flags = 0;
}
if (attention_info.flags == 0x20000008) {
attention_info.distances[fopAc_attn_TALK_e] = EMPTY_BOTTLE;
attention_info.distances[fopAc_attn_SPEAK_e] = EMPTY_BOTTLE;
attention_info.distances[fopAc_attn_TALK_e] = fpcNm_ITEM_EMPTY_BOTTLE;
attention_info.distances[fopAc_attn_SPEAK_e] = fpcNm_ITEM_EMPTY_BOTTLE;
eventInfo.i_onCondition(dEvtCnd_CANTALK_e);
}
@@ -147,12 +147,12 @@ s32 daTag_BottleItem_c::orderEvent() {
/* 80D56418-80D564A0 0004B8 0088+00 2/2 0/0 0/0 .text makeSoup__18daTag_BottleItem_cFv */
void daTag_BottleItem_c::makeSoup() {
if (mBottleItemType == LV1_SOUP && dComIfGs_isEventBit(2)) {
mBottleItemType = LV2_SOUP;
if (mBottleItemType == fpcNm_ITEM_LV1_SOUP && dComIfGs_isEventBit(2)) {
mBottleItemType = fpcNm_ITEM_LV2_SOUP;
}
if (mBottleItemType == LV2_SOUP && dComIfGs_isEventBit(1)) {
mBottleItemType = LV3_SOUP;
if (mBottleItemType == fpcNm_ITEM_LV2_SOUP && dComIfGs_isEventBit(1)) {
mBottleItemType = fpcNm_ITEM_LV3_SOUP;
}
}
src/d/actor/d_a_tag_statue_evt.cpp
+3 -3
View File
@@ -328,13 +328,13 @@ int daTagStatue_c::demoProc() {
case DEMO_ACTION_AWARD_ITEM:
// If the player already has 5 Sky Characters, reward them with the completed Ancient Sky Book,
// otherwise, reward another character
enum ItemTable item;
int item;
if(getLetterCount() == 5) {
item = ANCIENT_DOCUMENT2;
item = fpcNm_ITEM_ANCIENT_DOCUMENT2;
dComIfGs_onEventBit(dSv_event_flag_c::F_0796);
}
else {
item = AIR_LETTER;
item = fpcNm_ITEM_AIR_LETTER;
}
mTreasureDemoItemId = fopAcM_createItemForTrBoxDemo(&fopAcM_GetPosition(this), item, -1, fopAcM_GetRoomNo(this), 0, 0);
src/d/actor/d_a_tbox.cpp
+794 -509
View File
File diff suppressed because it is too large Load Diff
src/d/d_bg_plc.cpp
+13 -15
View File
@@ -1,7 +1,3 @@
//
// Translation Unit: d/d_bg_plc
//
#include "d/d_bg_plc.h"
#include "JSystem/JUtility/JUTAssert.h"
@@ -14,19 +10,20 @@ dBgPlc::dBgPlc() {
dBgPlc::~dBgPlc() {}
/* 800740BC-800740C4 -00001 0008+00 0/0 0/0 0/0 .text setBase__6dBgPlcFPv */
void dBgPlc::setBase(void* p_base) {
m_base = (PLC*)p_base;
void dBgPlc::setBase(void* pbase) {
m_base = (sBgPlc*)pbase;
}
/* 800740C4-800740DC 06EA04 0018+00 0/0 1/1 0/0 .text getCode__6dBgPlcCFiPP5sBgPc */
sBgPc* dBgPlc::getCode(int index, sBgPc** param_1) const {
sBgPc* dBgPlc::getCode(int index, sBgPc** ppcode) const {
JUT_ASSERT(45, m_base != 0);
JUT_ASSERT(46, m_base->m_code_size == ZELDA_CODE_SIZE);
JUT_ASSERT(47, index >= 0 && index< m_base->m_num);
sBgPc* rv = m_base->field_0x8;
rv += index;
*param_1 = rv;
return rv;
sBgPc* code = m_base->m_code;
code += index;
*ppcode = code;
return code;
}
/* 800740DC-800740F4 06EA1C 0018+00 0/0 1/1 0/0 .text getGrpCode__6dBgPlcCFi */
@@ -34,7 +31,8 @@ u32 dBgPlc::getGrpCode(int index) const {
JUT_ASSERT(62, m_base != 0);
JUT_ASSERT(63, m_base->m_code_size == ZELDA_CODE_SIZE);
JUT_ASSERT(64, 0 <= index && index < m_base->m_num);
sBgPc* rv = m_base->field_0x8;
rv += index;
return rv->code4;
}
sBgPc* code = m_base->m_code;
code += index;
return code->code4;
}
src/d/d_bg_w_kcol.cpp
+586 -320
View File
File diff suppressed because it is too large Load Diff
src/d/d_cam_param.cpp
+6
View File
@@ -144,6 +144,9 @@ dCamParam_c::dCamParam_c(s32 i_styleID) {
mMapToolArg2 = -1;
}
/* 8008858C-800885D4 082ECC 0048+00 1/0 1/1 0/0 .text __dt__11dCamParam_cFv */
dCamParam_c::~dCamParam_c() {}
/* 800885D4-80088620 082F14 004C+00 1/1 7/7 0/0 .text Change__11dCamParam_cFl */
int dCamParam_c::Change(s32 i_styleID) {
if (i_styleID >= 0 && i_styleID < mStyleNum) {
@@ -256,6 +259,9 @@ dCamSetup_c::dCamSetup_c() {
dCam_getBody()->EventRecoverNotime();
}
/* 800888B8-80088918 0831F8 0060+00 1/0 1/1 0/0 .text __dt__11dCamSetup_cFv */
dCamSetup_c::~dCamSetup_c() {}
/* 80088918-80088988 083258 0070+00 0/0 1/1 0/0 .text CheckLatitudeRange__11dCamSetup_cFPs */
bool dCamSetup_c::CheckLatitudeRange(s16* param_0) {
s16 temp0 = cAngle::d2s(field_0x60);
src/d/d_camera.cpp
+499 -992
View File
File diff suppressed because it is too large Load Diff
src/d/d_cc_uty.cpp
+2 -2
View File
@@ -13,7 +13,7 @@
#include "f_op/f_op_actor_mng.h"
bool daPy_py_c::checkWoodSwordEquip() {
return dComIfGs_getSelectEquipSword() == WOOD_STICK;
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK;
}
BOOL daPy_py_c::checkNowWolf() {
@@ -515,4 +515,4 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) {
}
return i_AtInfo->mpActor;
}
}
src/d/d_com_inf_game.cpp
+51 -51
View File
@@ -63,7 +63,7 @@ void dComIfG_play_c::itemInit() {
mNowOxygen = 600;
mMaxOxygen = 600;
if (dComIfGs_checkGetItem(HAWK_EYE)) {
if (dComIfGs_checkGetItem(fpcNm_ITEM_HAWK_EYE)) {
field_0x4f4b = 0;
} else {
field_0x4f4b = 21;
@@ -1461,7 +1461,7 @@ u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx) {
return sel_item_slotNo;
}
if (mix_item_slotNo != NO_ITEM && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) {
if (mix_item_slotNo != fpcNm_ITEM_NONE && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) {
return mix_item_slotNo;
}
@@ -1483,17 +1483,17 @@ void dComIfGp_setSelectItem(int i_selItemIdx) {
dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF);
}
} else {
g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, NO_ITEM);
g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE);
}
} else if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) {
u8 item = dComIfGs_getItem(dComIfGs_getSelectItemIndex(i_selItemIdx), false);
g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, item);
if (item == NO_ITEM) {
if (item == fpcNm_ITEM_NONE) {
dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF);
}
} else {
g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, NO_ITEM);
g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE);
}
}
@@ -1506,35 +1506,35 @@ u8 dComIfGp_getSelectItem(int i_selItemIdx) {
{
u8 saveItem = dComIfGs_getItem(dComIfGs_getMixItemIndex(i_selItemIdx), false);
if (saveItem == BOW) {
if (saveItem == fpcNm_ITEM_BOW) {
saveItem = playItem;
playItem = BOW;
} else if (saveItem == FISHING_ROD_1) {
playItem = fpcNm_ITEM_BOW;
} else if (saveItem == fpcNm_ITEM_FISHING_ROD_1) {
saveItem = playItem;
playItem = FISHING_ROD_1;
playItem = fpcNm_ITEM_FISHING_ROD_1;
}
if (playItem == BOW) {
if (playItem == fpcNm_ITEM_BOW) {
switch (saveItem) {
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
playItem = BOMB_ARROW;
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
playItem = fpcNm_ITEM_BOMB_ARROW;
break;
case HAWK_EYE:
playItem = HAWK_ARROW;
case fpcNm_ITEM_HAWK_EYE:
playItem = fpcNm_ITEM_HAWK_ARROW;
break;
}
} else if (playItem == FISHING_ROD_1) {
} else if (playItem == fpcNm_ITEM_FISHING_ROD_1) {
switch (saveItem) {
case BEE_CHILD:
playItem = BEE_ROD;
case fpcNm_ITEM_BEE_CHILD:
playItem = fpcNm_ITEM_BEE_ROD;
break;
case WORM:
playItem = WORM_ROD;
case fpcNm_ITEM_WORM:
playItem = fpcNm_ITEM_WORM_ROD;
break;
case ZORAS_JEWEL:
playItem = JEWEL_ROD;
case fpcNm_ITEM_ZORAS_JEWEL:
playItem = fpcNm_ITEM_JEWEL_ROD;
break;
}
}
@@ -1652,10 +1652,10 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int flag) {
u8 dComIfGs_checkGetInsectNum() {
static u8 l_itemno[24] = {
M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE,
M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI,
M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL,
M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY,
fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE,
fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI,
fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL,
fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY,
};
u8 insectCount = 0;
@@ -1706,14 +1706,14 @@ s16 dComIfGp_getSelectItemNum(int i_selItemIdx) {
u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
s16 itemNum = 0;
if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB ||
selectItem == BOMB_ARROW)
if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB ||
selectItem == fpcNm_ITEM_BOMB_ARROW)
{
selectItem = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15;
itemNum = dComIfGs_getBombNum(selectItem);
} else if (selectItem == PACHINKO) {
} else if (selectItem == fpcNm_ITEM_PACHINKO) {
itemNum = dComIfGs_getPachinkoNum();
} else if (selectItem == BEE_CHILD) {
} else if (selectItem == fpcNm_ITEM_BEE_CHILD) {
itemNum = dComIfGs_getBottleNum(dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11);
}
@@ -1725,15 +1725,15 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) {
u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
int itemNum = 0;
if (selectItem == BOMB_BAG_LV1) {
if (selectItem == fpcNm_ITEM_BOMB_BAG_LV1) {
itemNum = 1;
} else if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB ||
selectItem == BOMB_ARROW)
} else if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB ||
selectItem == fpcNm_ITEM_BOMB_ARROW)
{
itemNum = dComIfGs_getBombMax(selectItem);
} else if (selectItem == PACHINKO) {
} else if (selectItem == fpcNm_ITEM_PACHINKO) {
itemNum = dComIfGs_getPachinkoMax();
} else if (selectItem == BEE_CHILD) {
} else if (selectItem == fpcNm_ITEM_BEE_CHILD) {
itemNum = dComIfGs_getBottleMax();
}
@@ -1744,8 +1744,8 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) {
void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) {
u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB ||
selectItem == BOMB_ARROW)
if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB ||
selectItem == fpcNm_ITEM_BOMB_ARROW)
{
u8 mix_slotNo = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15;
@@ -1753,9 +1753,9 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) {
i_num = dComIfGs_getBombMax(selectItem);
}
dComIfGs_setBombNum(mix_slotNo, i_num);
} else if (selectItem == PACHINKO) {
} else if (selectItem == fpcNm_ITEM_PACHINKO) {
dComIfGs_setPachinkoNum(i_num);
} else if (selectItem == BEE_CHILD) {
} else if (selectItem == fpcNm_ITEM_BEE_CHILD) {
u8 bottle_slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11;
if (i_num > dComIfGs_getBottleMax()) {
@@ -1769,14 +1769,14 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) {
void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) {
u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB ||
selectItem == BOMB_ARROW)
if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB ||
selectItem == fpcNm_ITEM_BOMB_ARROW)
{
u8 slot_no = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15;
dComIfGp_setItemBombNumCount(slot_no, i_num);
} else if (selectItem == PACHINKO) {
} else if (selectItem == fpcNm_ITEM_PACHINKO) {
dComIfGp_setItemPachinkoNumCount(i_num);
} else if (selectItem == BEE_CHILD) {
} else if (selectItem == fpcNm_ITEM_BEE_CHILD) {
dComIfGs_addBottleNum(dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11, i_num);
}
}
@@ -1965,16 +1965,16 @@ void dComIfGs_setSelectEquipClothes(u8 i_itemNo) {
*/
void dComIfGs_setSelectEquipSword(u8 i_itemNo) {
switch (i_itemNo) {
case SWORD:
case fpcNm_ITEM_SWORD:
dComIfGs_setCollectSword(COLLECT_ORDON_SWORD);
break;
case MASTER_SWORD:
case fpcNm_ITEM_MASTER_SWORD:
dComIfGs_setCollectSword(COLLECT_MASTER_SWORD);
break;
case WOOD_STICK:
case fpcNm_ITEM_WOOD_STICK:
dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD);
break;
case LIGHT_SWORD:
case fpcNm_ITEM_LIGHT_SWORD:
dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD);
break;
}
@@ -1986,13 +1986,13 @@ void dComIfGs_setSelectEquipSword(u8 i_itemNo) {
*/
void dComIfGs_setSelectEquipShield(u8 i_itemNo) {
switch (i_itemNo) {
case WOOD_SHIELD:
case fpcNm_ITEM_WOOD_SHIELD:
dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD);
break;
case SHIELD:
case fpcNm_ITEM_SHIELD:
dComIfGs_setCollectShield(COLLECT_ORDON_SHIELD);
break;
case HYLIA_SHIELD:
case fpcNm_ITEM_HYLIA_SHIELD:
dComIfGs_setCollectShield(COLLECT_HYLIAN_SHIELD);
break;
}
src/d/d_ev_camera.cpp
+30 -31
View File
@@ -741,7 +741,7 @@ SECTION_SDATA2 static u8 lit_5144[8] = {
SECTION_SDATA2 static f32 lit_5145 = 182.04444885253906f;
/* 800897E8-8008A510 084128 0D28+00 0/0 1/0 0/0 .text fixedFrameEvCamera__9dCamera_cFv */
void dCamera_c::fixedFrameEvCamera() {
int dCamera_c::fixedFrameEvCamera() {
// NONMATCHING
}
@@ -763,7 +763,7 @@ SECTION_DEAD static char const* const stringBase_8037AB66 = "@PLAYER";
SECTION_SDATA2 static f32 lit_5346 = 1.0f;
/* 8008A510-8008A974 084E50 0464+00 0/0 1/0 0/0 .text stokerEvCamera__9dCamera_cFv */
void dCamera_c::stokerEvCamera() {
int dCamera_c::stokerEvCamera() {
// NONMATCHING
}
@@ -788,7 +788,7 @@ SECTION_SDATA2 static f32 lit_5844[1 + 1 /* padding */] = {
SECTION_SDATA2 static f64 lit_5846 = 4503599627370496.0 /* cast u32 to float */;
/* 8008A974-8008B9B0 0852B4 103C+00 0/0 1/0 0/0 .text rollingEvCamera__9dCamera_cFv */
void dCamera_c::rollingEvCamera() {
int dCamera_c::rollingEvCamera() {
// NONMATCHING
}
@@ -829,25 +829,25 @@ SECTION_SDATA2 static f64 lit_5962 = 4503601774854144.0 /* cast s32 to float */;
/* 8008B9B0-8008BE2C 0862F0 047C+00 0/0 1/0 0/0 .text fixedPositionEvCamera__9dCamera_cFv
*/
void dCamera_c::fixedPositionEvCamera() {
int dCamera_c::fixedPositionEvCamera() {
// NONMATCHING
}
/* 8008BE2C-8008BE50 08676C 0024+00 0/0 1/0 0/0 .text uniformTransEvCamera__9dCamera_cFv
*/
void dCamera_c::uniformTransEvCamera() {
int dCamera_c::uniformTransEvCamera() {
transEvCamera(1);
}
/* 8008BE50-8008BE74 086790 0024+00 0/0 1/0 0/0 .text uniformBrakeEvCamera__9dCamera_cFv
*/
void dCamera_c::uniformBrakeEvCamera() {
int dCamera_c::uniformBrakeEvCamera() {
transEvCamera(2);
}
/* 8008BE74-8008BE98 0867B4 0024+00 0/0 1/0 0/0 .text uniformAcceleEvCamera__9dCamera_cFv
*/
void dCamera_c::uniformAcceleEvCamera() {
int dCamera_c::uniformAcceleEvCamera() {
transEvCamera(3);
}
@@ -991,7 +991,7 @@ SECTION_SDATA2 static f32 lit_7346 = 1.0f / 10.0f;
SECTION_SDATA2 static f32 lit_7347 = 30.0f;
/* 8008E938-8008FA58 089278 1120+00 0/0 1/0 0/0 .text watchActorEvCamera__9dCamera_cFv */
void dCamera_c::watchActorEvCamera() {
int dCamera_c::watchActorEvCamera() {
// NONMATCHING
}
@@ -1027,12 +1027,12 @@ static u8 lit_7364[12];
static f32 DefaultGap_7363[3];
/* 8008FAE8-80090174 08A428 068C+00 0/0 1/0 0/0 .text restorePosEvCamera__9dCamera_cFv */
void dCamera_c::restorePosEvCamera() {
int dCamera_c::restorePosEvCamera() {
// NONMATCHING
}
/* 80090174-80090230 08AAB4 00BC+00 0/0 1/0 0/0 .text talktoEvCamera__9dCamera_cFv */
void dCamera_c::talktoEvCamera() {
int dCamera_c::talktoEvCamera() {
dComIfGp_event_getPt1();
s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[field_0x190][3];
@@ -1155,7 +1155,7 @@ SECTION_DEAD static char const* const stringBase_8037AC6A = "FN01";
#pragma pop
/* 80090478-80090514 08ADB8 009C+00 0/0 1/0 0/0 .text styleEvCamera__9dCamera_cFv */
bool dCamera_c::styleEvCamera() {
int dCamera_c::styleEvCamera() {
if (mCurCamTypeTimer == 0) {
mEventData.field_0x8 = 0;
field_0x160 = 0;
@@ -1166,7 +1166,6 @@ bool dCamera_c::styleEvCamera() {
return isModeOK();
}
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
@@ -1322,7 +1321,7 @@ SECTION_SDATA2 static f32 lit_8225 = 350.0f;
SECTION_SDATA2 static f32 lit_8226 = 49.0f / 50.0f;
/* 80090514-80091468 08AE54 0F54+00 0/0 1/0 0/0 .text gameOverEvCamera__9dCamera_cFv */
void dCamera_c::gameOverEvCamera() {
int dCamera_c::gameOverEvCamera() {
// NONMATCHING
}
@@ -1505,7 +1504,7 @@ SECTION_SDATA2 static f32 lit_8752 = -30.0f;
SECTION_SDATA2 static f32 lit_8753 = -160.0f;
/* 80091468-8009236C 08BDA8 0F04+00 1/0 1/0 0/0 .text tactEvCamera__9dCamera_cFv */
void dCamera_c::tactEvCamera() {
int dCamera_c::tactEvCamera() {
// NONMATCHING
}
@@ -1519,12 +1518,12 @@ extern "C" void dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs() {
/* 800923B8-800923C0 08CCF8 0008+00 0/0 1/0 0/0 .text turnToActorEvCamera__9dCamera_cFv
*/
bool dCamera_c::turnToActorEvCamera() {
int dCamera_c::turnToActorEvCamera() {
return true;
}
/* 800923C0-800924D0 08CD00 0110+00 0/0 1/0 0/0 .text stbWaitEvCamera__9dCamera_cFv */
bool dCamera_c::stbWaitEvCamera() {
int dCamera_c::stbWaitEvCamera() {
dDemo_camera_c* demo_cam = dDemo_c::getCamera();
#if DEBUG
char* enabled_report = "-----";
@@ -1580,7 +1579,7 @@ bool dCamera_c::stbWaitEvCamera() {
/* 800924D0-8009258C 08CE10 00BC+00 0/0 1/0 0/0 .text saveEvCamera__9dCamera_cFv */
bool dCamera_c::saveEvCamera() {
int dCamera_c::saveEvCamera() {
int slot;
getEvIntData(&slot, "Slot", 0);
@@ -1603,7 +1602,7 @@ SECTION_RODATA static u8 const lit_8840[24] = {
COMPILER_STRIP_GATE(0x8037A884, &lit_8840);
/* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text loadEvCamera__9dCamera_cFv */
void dCamera_c::loadEvCamera() {
int dCamera_c::loadEvCamera() {
// NONMATCHING
}
@@ -1778,7 +1777,7 @@ SECTION_SDATA2 static f32 lit_9440 = 270.0f;
SECTION_SDATA2 static f32 lit_9441 = 300.0f;
/* 800929AC-800937AC 08D2EC 0E00+00 0/0 1/0 0/0 .text useItem0EvCamera__9dCamera_cFv */
void dCamera_c::useItem0EvCamera() {
int dCamera_c::useItem0EvCamera() {
// NONMATCHING
}
@@ -1805,7 +1804,7 @@ SECTION_SDATA2 static f32 lit_9800 = -180.0f;
SECTION_SDATA2 static f32 lit_9801 = 170.0f;
/* 800937AC-80094240 08E0EC 0A94+00 0/0 1/0 0/0 .text useItem1EvCamera__9dCamera_cFv */
void dCamera_c::useItem1EvCamera() {
int dCamera_c::useItem1EvCamera() {
// NONMATCHING
}
@@ -1863,7 +1862,7 @@ SECTION_SDATA2 static f32 lit_10125 = -164.0f;
SECTION_SDATA2 static f32 lit_10126 = -220.0f;
/* 80094240-80094A70 08EB80 0830+00 0/0 1/0 0/0 .text getItemEvCamera__9dCamera_cFv */
void dCamera_c::getItemEvCamera() {
int dCamera_c::getItemEvCamera() {
// NONMATCHING
}
@@ -1896,7 +1895,7 @@ SECTION_SDATA2 static f32 lit_10283 = 9.0f / 100.0f;
SECTION_SDATA2 static f32 lit_10284 = 9.0f / 50.0f;
/* 80094A70-80095010 08F3B0 05A0+00 0/0 1/0 0/0 .text possessedEvCamera__9dCamera_cFv */
void dCamera_c::possessedEvCamera() {
int dCamera_c::possessedEvCamera() {
// NONMATCHING
}
@@ -1915,12 +1914,12 @@ SECTION_SDATA2 static f32 lit_10437 = 1.0f / 100.0f;
/* 80095010-8009544C 08F950 043C+00 0/0 1/0 0/0 .text fixedFramesEvCamera__9dCamera_cFv
*/
void dCamera_c::fixedFramesEvCamera() {
int dCamera_c::fixedFramesEvCamera() {
// NONMATCHING
}
/* 8009544C-800956E4 08FD8C 0298+00 0/0 1/0 0/0 .text bSplineEvCamera__9dCamera_cFv */
void dCamera_c::bSplineEvCamera() {
int dCamera_c::bSplineEvCamera() {
// NONMATCHING
}
@@ -1956,12 +1955,12 @@ SECTION_SDATA2 static f32 lit_10781 = 10000.0f;
SECTION_SDATA2 static f32 lit_10782 = 0.25f;
/* 800956E4-80095E7C 090024 0798+00 0/0 1/0 0/0 .text twoActor0EvCamera__9dCamera_cFv */
void dCamera_c::twoActor0EvCamera() {
int dCamera_c::twoActor0EvCamera() {
// NONMATCHING
}
/* 80095E7C-80095FD0 0907BC 0154+00 0/0 1/0 0/0 .text peepHoleEvCamera__9dCamera_cFv */
void dCamera_c::peepHoleEvCamera() {
int dCamera_c::peepHoleEvCamera() {
// NONMATCHING
}
@@ -1976,7 +1975,7 @@ SECTION_DEAD static char const* const stringBase_8037AD14 = "R_SP01";
SECTION_SDATA2 static f32 lit_11068 = 245.0f;
/* 80095FD0-800965AC 090910 05DC+00 0/0 1/0 0/0 .text digHoleEvCamera__9dCamera_cFv */
void dCamera_c::digHoleEvCamera() {
int dCamera_c::digHoleEvCamera() {
// NONMATCHING
}
@@ -2023,7 +2022,7 @@ SECTION_SDATA2 static f32 lit_11421 = 0.75f;
SECTION_SDATA2 static f32 lit_11422 = 2.0f / 5.0f;
/* 800965AC-80096EDC 090EEC 0930+00 0/0 1/0 0/0 .text hintTalkEvCamera__9dCamera_cFv */
void dCamera_c::hintTalkEvCamera() {
int dCamera_c::hintTalkEvCamera() {
// NONMATCHING
}
@@ -2050,12 +2049,12 @@ SECTION_DEAD static char const* const pad_8037AD67 = "";
#pragma pop
/* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text bspTransEvCamera__9dCamera_cFv */
void dCamera_c::bspTransEvCamera() {
int dCamera_c::bspTransEvCamera() {
// NONMATCHING
}
/* 80097694-8009769C 091FD4 0008+00 0/0 1/0 0/0 .text portalWarpEvCamera__9dCamera_cFv */
bool dCamera_c::portalWarpEvCamera() {
int dCamera_c::portalWarpEvCamera() {
return true;
}
@@ -2170,4 +2169,4 @@ extern "C" void getShadowTalkAtnPos__9daAlink_cFv() {
// NONMATCHING
}
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_event.cpp
+3 -3
View File
@@ -285,7 +285,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) {
return 0;
}
if (dComIfGp_getSelectItem(itemIndex) == NO_ITEM) {
if (dComIfGp_getSelectItem(itemIndex) == fpcNm_ITEM_NONE) {
return 0;
}
@@ -503,7 +503,7 @@ int dEvt_control_c::endProc() {
field_0xec = 255;
field_0xed = 0;
mEventID = 255;
mPreItemNo = NO_ITEM;
mPreItemNo = fpcNm_ITEM_NONE;
dComIfGp_getEventManager().setStartDemo(-2);
return 1;
}
@@ -1049,7 +1049,7 @@ void dEvt_control_c::remove() {
mStageEventDt = NULL;
mEventID = 255;
field_0xed = 0;
mPreItemNo = NO_ITEM;
mPreItemNo = fpcNm_ITEM_NONE;
mEventFlag = 0;
mFlag2 = 0;
mChangeOK = NULL;
src/d/d_gameover.cpp
+3 -3
View File
@@ -162,7 +162,7 @@ int dGameover_c::_create() {
if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) {
// Last stage was Stallord Arena
// Remove Ooccoo from inventory
dComIfGs_setItem(SLOT_18, NO_ITEM);
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE);
dComIfGs_resetLastWarpAcceptStage();
}
@@ -340,8 +340,8 @@ void dGameover_c::saveClose_proc() {
}
// Reset Lantern and oil status back into inventory if gameover during monkey steal sequence
if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) {
dComIfGs_setItem(SLOT_1, KANTERA);
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) {
dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA);
dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp());
}
src/d/d_insect.cpp
+2 -2
View File
@@ -31,7 +31,7 @@ dInsect_c::dInsect_c() {
field_0x56C = 0;
mDraw = true;
m_mode = 0;
m_itemNo = M_MAYFLY;
m_itemNo = fpcNm_ITEM_M_MAYFLY;
field_0x584 = 0;
field_0x585 = 0;
}
@@ -80,7 +80,7 @@ void dInsect_c::Insect_GetDemoMain() {
mDraw = true;
m_mode = 0;
if (field_0x584 == 0) {
fopAcM_createItem(&current.pos, HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&current.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
field_0x584 = 1;
}
} else {
src/d/d_item.cpp
+294 -294
View File
File diff suppressed because it is too large Load Diff
src/d/d_kankyo.cpp
+1 -1
View File
@@ -1777,7 +1777,7 @@ static void dKy_calc_color_set(GXColorS10* o_calcColor, color_RGB_class* i_col0A
}
inline bool checkZoraWearFlg() {
return dComIfGs_getSelectEquipClothes() == WEAR_ZORA;
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA;
}
/* 801A040C-801A133C 19AD4C 0F30+00 1/1 0/0 0/0 .text setLight__18dScnKy_env_light_cFv */
src/d/d_menu_collect.cpp
+45 -45
View File
@@ -364,7 +364,7 @@ void dMenu_Collect2D_c::screenSet() {
field_0x22d[0][2] = 0;
field_0x22d[1][2] = 0;
field_0x22d[2][2] = 0;
if (dComIfGs_getSelectEquipClothes() == WEAR_CASUAL) {
if (dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL) {
field_0x22d[3][2] = 0;
field_0x22d[4][2] = 0;
field_0x22d[5][2] = 0;
@@ -375,7 +375,7 @@ void dMenu_Collect2D_c::screenSet() {
}
field_0x22d[6][2] = 0;
field_0x22d[0][3] = 1;
if (checkItemGet(BOW, 1)) {
if (checkItemGet(fpcNm_ITEM_BOW, 1)) {
field_0x22d[1][3] = 1;
} else {
field_0x22d[1][3] = 0;
@@ -389,7 +389,7 @@ void dMenu_Collect2D_c::screenSet() {
field_0x22d[4][3] = 0;
field_0x22d[5][3] = 0;
field_0x22d[6][3] = 0;
if (dComIfGs_getCollectSmell() != NO_ITEM) {
if (dComIfGs_getCollectSmell() != fpcNm_ITEM_NONE) {
field_0x22d[0][4] = 1;
} else {
field_0x22d[0][4] = 0;
@@ -986,39 +986,39 @@ void dMenu_Collect2D_c::cursorPosSet() {
void dMenu_Collect2D_c::changeSword() {
switch (mCursorX) {
case 3:
if (dComIfGs_isItemFirstBit(SWORD)) {
if (dComIfGs_getSelectEquipSword() != SWORD) {
dMeter2Info_setSword(SWORD, false);
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SWORD)) {
if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_SWORD) {
dMeter2Info_setSword(fpcNm_ITEM_SWORD, false);
setEquipItemFrameColorSword(0);
mDoAud_seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0);
dMeter2Info_set2DVibration();
}
} else if (dComIfGs_getSelectEquipSword() != WOOD_STICK) {
dMeter2Info_setSword(WOOD_STICK, false);
} else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_WOOD_STICK) {
dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false);
setEquipItemFrameColorSword(0);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
break;
case 4:
if (dComIfGs_isItemFirstBit(LIGHT_SWORD)) {
if (dComIfGs_getSelectEquipSword() != LIGHT_SWORD) {
dMeter2Info_setSword(LIGHT_SWORD, false);
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) {
if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) {
dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false);
setEquipItemFrameColorSword(1);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
}
} else if (dComIfGs_getSelectEquipSword() != MASTER_SWORD) {
dMeter2Info_setSword(MASTER_SWORD, false);
} else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_MASTER_SWORD) {
dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false);
setEquipItemFrameColorSword(1);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
}
break;
case 5:
if (dComIfGs_getSelectEquipSword() != LIGHT_SWORD) {
dMeter2Info_setSword(LIGHT_SWORD, false);
if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) {
dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false);
setEquipItemFrameColorSword(2);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
@@ -1032,18 +1032,18 @@ void dMenu_Collect2D_c::changeSword() {
void dMenu_Collect2D_c::changeShield() {
switch (mCursorX) {
case 3:
if (dComIfGs_isItemFirstBit(SHIELD)) {
if (dComIfGs_getSelectEquipShield() != SHIELD) {
dMeter2Info_setShield(SHIELD, false);
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD)) {
if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_SHIELD) {
dMeter2Info_setShield(fpcNm_ITEM_SHIELD, false);
setEquipItemFrameColorShield(0);
daAlink_getAlinkActorClass()->setShieldChange();
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
}
} else if (dComIfGs_isItemFirstBit(WOOD_SHIELD)) {
if (dComIfGs_getSelectEquipShield() != WOOD_SHIELD) {
dMeter2Info_setShield(WOOD_SHIELD, false);
} else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) {
if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_WOOD_SHIELD) {
dMeter2Info_setShield(fpcNm_ITEM_WOOD_SHIELD, false);
setEquipItemFrameColorShield(0);
daAlink_getAlinkActorClass()->setShieldChange();
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
@@ -1053,8 +1053,8 @@ void dMenu_Collect2D_c::changeShield() {
}
break;
case 4:
if (dComIfGs_getSelectEquipShield() != HYLIA_SHIELD) {
dMeter2Info_setShield(HYLIA_SHIELD, false);
if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_HYLIA_SHIELD) {
dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false);
setEquipItemFrameColorShield(1);
daAlink_getAlinkActorClass()->setShieldChange();
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1069,8 +1069,8 @@ void dMenu_Collect2D_c::changeShield() {
void dMenu_Collect2D_c::changeClothe() {
switch (mCursorX) {
case 3:
if (dComIfGs_getSelectEquipClothes() != WEAR_KOKIRI) {
dMeter2Info_setCloth(WEAR_KOKIRI, false);
if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_KOKIRI) {
dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false);
setEquipItemFrameColorClothes(0);
daPy_getPlayerActorClass()->setClothesChange(0);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1078,8 +1078,8 @@ void dMenu_Collect2D_c::changeClothe() {
}
break;
case 4:
if (dComIfGs_getSelectEquipClothes() != WEAR_ZORA) {
dMeter2Info_setCloth(WEAR_ZORA, false);
if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_ZORA) {
dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false);
setEquipItemFrameColorClothes(1);
daPy_getPlayerActorClass()->setClothesChange(0);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1087,8 +1087,8 @@ void dMenu_Collect2D_c::changeClothe() {
}
break;
case 5:
if (dComIfGs_getSelectEquipClothes() != ARMOR) {
dMeter2Info_setCloth(ARMOR, false);
if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_ARMOR) {
dMeter2Info_setCloth(fpcNm_ITEM_ARMOR, false);
setEquipItemFrameColorClothes(2);
daPy_getPlayerActorClass()->setClothesChange(0);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1153,19 +1153,19 @@ void dMenu_Collect2D_c::setSmellType() {
};
s32 smellType = -1;
switch (dComIfGs_getCollectSmell()) {
case SMELL_YELIA_POUCH:
case fpcNm_ITEM_SMELL_YELIA_POUCH:
smellType = 3;
break;
case SMELL_POH:
case fpcNm_ITEM_SMELL_POH:
smellType = 4;
break;
case SMELL_FISH:
case fpcNm_ITEM_SMELL_FISH:
smellType = 2;
break;
case SMELL_CHILDREN:
case fpcNm_ITEM_SMELL_CHILDREN:
smellType = 1;
break;
case SMELL_MEDICINE:
case fpcNm_ITEM_SMELL_MEDICINE:
smellType = 0;
break;
}
@@ -1248,20 +1248,20 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) {
mEquippedSword = dComIfGs_getSelectEquipSword();
switch (mEquippedSword) {
case SWORD:
case fpcNm_ITEM_SWORD:
i_frame = 0;
break;
case WOOD_STICK:
case fpcNm_ITEM_WOOD_STICK:
i_frame = 0;
break;
case MASTER_SWORD:
case fpcNm_ITEM_MASTER_SWORD:
i_frame = 1;
break;
case LIGHT_SWORD:
if (dComIfGs_isItemFirstBit(LIGHT_SWORD)) {
case fpcNm_ITEM_LIGHT_SWORD:
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) {
i_frame = 1;
}
break;
@@ -1307,12 +1307,12 @@ void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) {
mEquippedShield = dComIfGs_getSelectEquipShield();
switch (mEquippedShield) {
case SHIELD:
case WOOD_SHIELD:
case fpcNm_ITEM_SHIELD:
case fpcNm_ITEM_WOOD_SHIELD:
i_frame = 0;
break;
case HYLIA_SHIELD:
case fpcNm_ITEM_HYLIA_SHIELD:
i_frame = 1;
break;
}
@@ -1358,15 +1358,15 @@ void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) {
mEquippedClothes = dComIfGs_getSelectEquipClothes();
switch (mEquippedClothes) {
case WEAR_KOKIRI:
case fpcNm_ITEM_WEAR_KOKIRI:
i_frame = 0;
break;
case WEAR_ZORA:
case fpcNm_ITEM_WEAR_ZORA:
i_frame = 1;
break;
case ARMOR:
case fpcNm_ITEM_ARMOR:
i_frame = 2;
break;
}
src/d/d_menu_insect.cpp
+11 -11
View File
@@ -563,10 +563,10 @@ void dMenu_Insect_c::screenSetDoIcon() {
*/
u8 dMenu_Insect_c::getGetInsectNum() {
static u8 l_itemno[MAX_INSECT_NUM] = {
M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE,
M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI,
M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL,
M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY,
fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE,
fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI,
fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL,
fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY,
};
u8 insectNum = 0;
@@ -585,10 +585,10 @@ u8 dMenu_Insect_c::getGetInsectNum() {
/* 801D9DCC-801D9DE4 1D470C 0018+00 3/3 0/0 0/0 .text getInsectItemID__14dMenu_Insect_cFii */
u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) {
static u8 l_itemno[MAX_INSECT_NUM] = {
M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, M_BEETLE, F_BEETLE,
M_MANTIS, F_MANTIS, M_STAG_BEETLE, F_STAG_BEETLE, M_DANGOMUSHI, F_DANGOMUSHI,
M_BUTTERFLY, F_BUTTERFLY, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL,
M_NANAFUSHI, F_NANAFUSHI, M_GRASSHOPPER, F_GRASSHOPPER, M_DRAGONFLY, F_DRAGONFLY,
fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE,
fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI,
fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL,
fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY,
};
int index = param_0 + param_1 * 6;
@@ -615,7 +615,7 @@ bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) {
/* 801D9E7C-801D9ED4 1D47BC 0058+00 1/1 0/0 0/0 .text isCatchInsect__14dMenu_Insect_cFUc
*/
bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) {
if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) {
if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) {
return dComIfGs_isItemFirstBit(i_insectID);
}
return false;
@@ -624,7 +624,7 @@ bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) {
/* 801D9ED4-801D9F3C 1D4814 0068+00 1/1 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFUc
*/
bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) {
if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) {
if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) {
int label = i_insectID + 0xd1;
return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[label]);
}
@@ -779,4 +779,4 @@ void dMenu_Insect_c::setHIO(bool i_useHIO) {
g_drawHIO.mCollectScreen.mButtonBTextScale);
}
}
}
}
src/d/d_menu_item_explain.cpp
+3 -3
View File
@@ -369,7 +369,7 @@ void dMenu_ItemExplain_c::open_init() {
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) {
s32 itemsObtained = 0;
for (int i = 0; i < 3; i++) {
if (checkItemGet(i + L2_KEY_PIECES1, 1) != 0) {
if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) {
itemsObtained++;
}
}
@@ -648,7 +648,7 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11 && param_0 == 0x26) {
for (int i = 0; i < 3; i++) {
if (checkItemGet(i + L2_KEY_PIECES1, 1) != 0) {
if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) {
itemsObtained++;
}
}
@@ -830,4 +830,4 @@ void dMenu_ItemExplain_c::setScale() {
f32 h = mpExpItemTex[0]->height / 48.0f * scale;
mpInfoIcon->scale(w, h);
}
}
}
src/d/d_menu_ring.cpp
+156 -156
View File
@@ -213,7 +213,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
mItemSlotParam1[i] = 0.0f;
}
for (int i = 0; i < MAX_ITEM_SLOTS; i++) {
if (dComIfGs_getLineUpItem(i) != NO_ITEM) {
if (dComIfGs_getLineUpItem(i) != fpcNm_ITEM_NONE) {
mTotalItemTexToAlloc++;
}
}
@@ -287,10 +287,10 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
mpItemBuf[i][j] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20);
}
u8 item = dComIfGs_getItem(mItemSlots[i], false);
if (item != NO_ITEM) {
if (item == LIGHT_ARROW) {
if (item != fpcNm_ITEM_NONE) {
if (item == fpcNm_ITEM_LIGHT_ARROW) {
// safety check to prevent attempts setting up a light arrow texture
item = BOW;
item = fpcNm_ITEM_BOW;
}
s32 i_textureNum =
dMeter2Info_readItemTexture(item, mpItemBuf[i][0], NULL, mpItemBuf[i][1], NULL,
@@ -397,7 +397,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
mpItemExplain = new dMenu_ItemExplain_c(mpHeap, dComIfGp_getRingResArchive(), i_stick, true);
setRotate();
mpDrawCursor->setPos(mItemSlotPosX[0] + mCenterPosX, mItemSlotPosY[0] + mCenterPosY);
if (dComIfGs_getItem(mItemSlots[0], false) != NO_ITEM) {
if (dComIfGs_getItem(mItemSlots[0], false) != fpcNm_ITEM_NONE) {
mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f);
} else {
mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f);
@@ -640,7 +640,7 @@ bool dMenu_Ring_c::isOpen() {
}
setScale();
mpDrawCursor->setPos(mItemSlotPosX[SLOT_0] + mCenterPosX, mItemSlotPosY[SLOT_0] + mCenterPosY);
if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != NO_ITEM) {
if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != fpcNm_ITEM_NONE) {
mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f);
} else {
mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f);
@@ -704,7 +704,7 @@ bool dMenu_Ring_c::isClose() {
}
mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot] + mCenterPosX,
mItemSlotPosY[mCurrentSlot] + mCenterPosY);
if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != NO_ITEM) {
if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) {
mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f,
0.5f);
} else {
@@ -869,25 +869,25 @@ void dMenu_Ring_c::setItem() {
u8 uVar3;
u8 uVar4;
if (mXButtonSlot != NO_ITEM) {
if (mXButtonSlot != fpcNm_ITEM_NONE) {
uVar1 = mItemSlots[mXButtonSlot];
} else {
uVar1 = NO_ITEM;
uVar1 = fpcNm_ITEM_NONE;
}
if (mYButtonSlot != NO_ITEM) {
if (mYButtonSlot != fpcNm_ITEM_NONE) {
uVar2 = mItemSlots[mYButtonSlot];
} else {
uVar2 = NO_ITEM;
uVar2 = fpcNm_ITEM_NONE;
}
if (field_0x6ac != NO_ITEM) {
if (field_0x6ac != fpcNm_ITEM_NONE) {
uVar3 = mItemSlots[field_0x6ac];
} else {
uVar3 = NO_ITEM;
uVar3 = fpcNm_ITEM_NONE;
}
if (field_0x6ad != NO_ITEM) {
if (field_0x6ad != fpcNm_ITEM_NONE) {
uVar4 = mItemSlots[field_0x6ad];
} else {
uVar4 = NO_ITEM;
uVar4 = fpcNm_ITEM_NONE;
}
u8 mixItemIndex0 = dComIfGs_getMixItemIndex(0);
@@ -903,30 +903,30 @@ void dMenu_Ring_c::setItem() {
if (mItemSlots[mCurrentSlot] == uVar1) {
uVar2 = dComIfGs_getSelectItemIndex(0);
mixItemIndex1 = dComIfGs_getMixItemIndex(0);
if (uVar2 == NO_ITEM) {
mYButtonSlot = NO_ITEM;
if (uVar2 == fpcNm_ITEM_NONE) {
mYButtonSlot = fpcNm_ITEM_NONE;
} else {
mYButtonSlot = mXButtonSlot;
}
mXButtonSlot = mCurrentSlot;
uVar1 = mItemSlots[mXButtonSlot];
mixItemIndex0 = NO_ITEM;
mixItemIndex0 = fpcNm_ITEM_NONE;
} else {
if (dComIfGs_getMixItemIndex(1) == mItemSlots[mCurrentSlot]) {
uVar2 = dComIfGs_getSelectItemIndex(0);
mixItemIndex1 = NO_ITEM;
if (uVar2 == NO_ITEM) {
mYButtonSlot = NO_ITEM;
mixItemIndex1 = fpcNm_ITEM_NONE;
if (uVar2 == fpcNm_ITEM_NONE) {
mYButtonSlot = fpcNm_ITEM_NONE;
} else {
mYButtonSlot = mXButtonSlot;
}
mXButtonSlot = mCurrentSlot;
uVar1 = mItemSlots[mXButtonSlot];
mixItemIndex0 = NO_ITEM;
mixItemIndex0 = fpcNm_ITEM_NONE;
} else {
mXButtonSlot = mCurrentSlot;
uVar1 = mItemSlots[mXButtonSlot];
mixItemIndex0 = NO_ITEM;
mixItemIndex0 = fpcNm_ITEM_NONE;
}
}
} else if (field_0x6b3 == 1) {
@@ -934,30 +934,30 @@ void dMenu_Ring_c::setItem() {
u8 temp = dComIfGs_getSelectItemIndex(1);
uVar1 = temp;
mixItemIndex0 = dComIfGs_getMixItemIndex(1);
if (temp == NO_ITEM) {
mXButtonSlot = NO_ITEM;
if (temp == fpcNm_ITEM_NONE) {
mXButtonSlot = fpcNm_ITEM_NONE;
} else {
mXButtonSlot = mYButtonSlot;
}
mYButtonSlot = mCurrentSlot;
uVar2 = mItemSlots[mYButtonSlot];
mixItemIndex1 = NO_ITEM;
mixItemIndex1 = fpcNm_ITEM_NONE;
} else {
if (dComIfGs_getMixItemIndex(0) == mItemSlots[mCurrentSlot]) {
uVar1 = dComIfGs_getSelectItemIndex(1);
mixItemIndex0 = NO_ITEM;
if (uVar1 == NO_ITEM) {
mXButtonSlot = NO_ITEM;
mixItemIndex0 = fpcNm_ITEM_NONE;
if (uVar1 == fpcNm_ITEM_NONE) {
mXButtonSlot = fpcNm_ITEM_NONE;
} else {
mXButtonSlot = mYButtonSlot;
}
mYButtonSlot = mCurrentSlot;
uVar2 = mItemSlots[mYButtonSlot];
mixItemIndex1 = NO_ITEM;
mixItemIndex1 = fpcNm_ITEM_NONE;
} else {
mYButtonSlot = mCurrentSlot;
uVar2 = mItemSlots[mYButtonSlot];
mixItemIndex1 = NO_ITEM;
mixItemIndex1 = fpcNm_ITEM_NONE;
}
}
}
@@ -967,9 +967,9 @@ void dMenu_Ring_c::setItem() {
field_0x6b4[3] = uVar4;
field_0x6b8[0] = mixItemIndex0;
field_0x6b8[1] = mixItemIndex1;
field_0x6b8[2] = NO_ITEM;
field_0x6b8[3] = NO_ITEM;
field_0x6cd = NO_ITEM;
field_0x6b8[2] = fpcNm_ITEM_NONE;
field_0x6b8[3] = fpcNm_ITEM_NONE;
field_0x6cd = fpcNm_ITEM_NONE;
setJumpItem(true);
}
@@ -984,19 +984,19 @@ void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) {
setSelectItem(i, getItem(field_0x6b4[i], field_0x6b8[i]));
}
}
if (mXButtonSlot != NO_ITEM) {
if (mXButtonSlot != fpcNm_ITEM_NONE) {
field_0x518[0] = mItemSlotPosX[mXButtonSlot];
field_0x528[0] = mItemSlotPosY[mXButtonSlot];
}
if (mYButtonSlot != NO_ITEM) {
if (mYButtonSlot != fpcNm_ITEM_NONE) {
field_0x518[1] = mItemSlotPosX[mYButtonSlot];
field_0x528[1] = mItemSlotPosY[mYButtonSlot];
}
if (field_0x6ac != NO_ITEM) {
if (field_0x6ac != fpcNm_ITEM_NONE) {
field_0x518[2] = mItemSlotPosX[field_0x6ac];
field_0x528[2] = mItemSlotPosY[field_0x6ac];
}
if (field_0x6ad != NO_ITEM) {
if (field_0x6ad != fpcNm_ITEM_NONE) {
field_0x518[3] = mItemSlotPosX[field_0x6ad];
field_0x528[3] = mItemSlotPosY[field_0x6ad];
}
@@ -1109,12 +1109,12 @@ void dMenu_Ring_c::setNameString(u32 i_stringID) {
void dMenu_Ring_c::setActiveCursor() {
u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
if (mStatus == STATUS_WAIT && mOldStatus != STATUS_EXPLAIN_FORCE && mOldStatus != STATUS_EXPLAIN && mpItemExplain->getStatus() == 0) {
if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != NO_ITEM) {
if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) {
for (int i = 0; i < MAX_SELECT_ITEM; i++) {
setSelectItemForce(i);
}
setMixItem();
} else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != NO_ITEM) {
} else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) {
for (int i = 0; i < MAX_SELECT_ITEM; i++) {
setSelectItemForce(i);
}
@@ -1126,7 +1126,7 @@ void dMenu_Ring_c::setActiveCursor() {
(this->*stick_init[mStatus])();
}
}
} else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != NO_ITEM) {
} else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) {
for (int i = 0; i < MAX_SELECT_ITEM; i++) {
setSelectItemForce(i);
}
@@ -1151,7 +1151,7 @@ void dMenu_Ring_c::setMixItem() {
bool bVar1 = false;
u8 selectItemIndex0 = dComIfGs_getSelectItemIndex(0);
u8 selectItemIndex1 = dComIfGs_getSelectItemIndex(1);
u8 local_28[4] = {NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM};
u8 local_28[4] = {fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE};
if (dComIfGs_getMixItemIndex(0) == SLOT_4 &&
mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0))
@@ -1177,11 +1177,11 @@ void dMenu_Ring_c::setMixItem() {
bVar1 = true;
} else {
switch (item) {
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
case HAWK_EYE:
if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == NO_ITEM) ||
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
case fpcNm_ITEM_HAWK_EYE:
if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) ||
(dComIfGs_getMixItemIndex(0) == 4))
{
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
@@ -1197,7 +1197,7 @@ void dMenu_Ring_c::setMixItem() {
mYButtonSlot = 0xff;
}
} else if ((dComIfGs_getSelectItemIndex(1) == 4 &&
dComIfGs_getMixItemIndex(1) == NO_ITEM) ||
dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) ||
(dComIfGs_getMixItemIndex(1) == 4))
{
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
@@ -1220,10 +1220,10 @@ void dMenu_Ring_c::setMixItem() {
field_0x6b4[0] = selectItemIndex0;
field_0x6b4[1] = selectItemIndex1;
setJumpItem(false);
if (local_28[0] != NO_ITEM) {
if (local_28[0] != fpcNm_ITEM_NONE) {
mXButtonSlot = local_28[0];
}
if (local_28[1] != NO_ITEM) {
if (local_28[1] != fpcNm_ITEM_NONE) {
mYButtonSlot = local_28[1];
}
}
@@ -1265,7 +1265,7 @@ void dMenu_Ring_c::drawItem() {
f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[i] - 24.0f + mCenterPosY);
mpItemTex[i][j]->draw(x, y, f0, f1, 0, 0, 0);
u8 item = dComIfGs_getItem(mItemSlots[i], false);
if ((j == 0 && item != BEE_CHILD) || (j == 2 && item == BEE_CHILD)) {
if ((j == 0 && item != fpcNm_ITEM_BEE_CHILD) || (j == 2 && item == fpcNm_ITEM_BEE_CHILD)) {
u8 itemNum = getItemNum(mItemSlots[i]);
u8 itemMaxNum = getItemMaxNum(mItemSlots[i]);
if (itemMaxNum != 0) {
@@ -1273,7 +1273,7 @@ void dMenu_Ring_c::drawItem() {
drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f);
}
}
if (j == 0 && item == KANTERA /* Lantern */) {
if (j == 0 && item == fpcNm_ITEM_KANTERA /* Lantern */) {
setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f);
mpKanteraMeter->setScale(0.64f, 0.64f);
mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil());
@@ -1308,7 +1308,7 @@ void dMenu_Ring_c::drawItem2() {
f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[idx] - 24.0f + mCenterPosY);
mpItemTex[idx][i]->draw(x, y, f0, f1, 0, 0, 0);
u8 item = dComIfGs_getItem(mItemSlots[idx], false);
if ((i == 0 && item != BEE_CHILD) || (i == 2 && item == BEE_CHILD)) {
if ((i == 0 && item != fpcNm_ITEM_BEE_CHILD) || (i == 2 && item == fpcNm_ITEM_BEE_CHILD)) {
u8 itemNum = getItemNum(mItemSlots[idx]);
u8 itemMaxNum = getItemMaxNum(mItemSlots[idx]);
if (itemMaxNum != 0) {
@@ -1316,7 +1316,7 @@ void dMenu_Ring_c::drawItem2() {
drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f);
}
}
if (i == 0 && item == KANTERA) {
if (i == 0 && item == fpcNm_ITEM_KANTERA) {
setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f);
mpKanteraMeter->setScale(0.64f, 0.64f);
mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil());
@@ -1350,7 +1350,7 @@ void dMenu_Ring_c::stick_wait_init() {
void dMenu_Ring_c::stick_wait_proc() {
u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
if (item != NO_ITEM) {
if (item != fpcNm_ITEM_NONE) {
setDoStatus(0x24);
} else {
setDoStatus(0);
@@ -1403,7 +1403,7 @@ void dMenu_Ring_c::stick_move_proc() {
field_0x66e = field_0x670;
mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]);
u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
if (item != NO_ITEM) {
if (item != fpcNm_ITEM_NONE) {
mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f,
0.6f, 0.5f);
} else {
@@ -1430,7 +1430,7 @@ void dMenu_Ring_c::stick_move_proc() {
field_0x66e = field_0x670;
mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]);
u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
if (item != NO_ITEM) {
if (item != fpcNm_ITEM_NONE) {
mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f,
0.6f, 0.5f);
} else {
@@ -1498,7 +1498,7 @@ void dMenu_Ring_c::stick_explain_force_proc() {
void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) {
f32 texScale = 1.0f;
if (i_itemNo != NO_ITEM) {
if (i_itemNo != fpcNm_ITEM_NONE) {
if (field_0x6be[i_idx] == 0) {
field_0x6be[i_idx] = 1;
} else {
@@ -1597,26 +1597,26 @@ u8 dMenu_Ring_c::getItemNum(u8 i_slotNo) {
u8 ret = 0;
switch (item) {
case BOMB_BAG_LV1:
case fpcNm_ITEM_BOMB_BAG_LV1:
ret = 0;
break;
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
ret = dComIfGs_getBombNum(i_slotNo - 0xF);
break;
case BEE_CHILD:
case fpcNm_ITEM_BEE_CHILD:
ret = dComIfGs_getBottleNum(i_slotNo - 0xB);
break;
case BOW:
case LIGHT_ARROW:
case ARROW_LV1:
case ARROW_LV2:
case ARROW_LV3:
case fpcNm_ITEM_BOW:
case fpcNm_ITEM_LIGHT_ARROW:
case fpcNm_ITEM_ARROW_LV1:
case fpcNm_ITEM_ARROW_LV2:
case fpcNm_ITEM_ARROW_LV3:
ret = dComIfGs_getArrowNum();
break;
case PACHINKO:
case fpcNm_ITEM_PACHINKO:
ret = dComIfGs_getPachinkoNum();
break;
}
@@ -1637,26 +1637,26 @@ u8 dMenu_Ring_c::getItemMaxNum(u8 i_slotNo) {
u8 ret = 0;
switch (item) {
case BOMB_BAG_LV1:
case fpcNm_ITEM_BOMB_BAG_LV1:
ret = 1;
break;
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
ret = dComIfGs_getBombMax(item);
break;
case BEE_CHILD:
case fpcNm_ITEM_BEE_CHILD:
ret = dComIfGs_getBottleMax();
break;
case BOW:
case LIGHT_ARROW:
case ARROW_LV1:
case ARROW_LV2:
case ARROW_LV3:
case fpcNm_ITEM_BOW:
case fpcNm_ITEM_LIGHT_ARROW:
case fpcNm_ITEM_ARROW_LV1:
case fpcNm_ITEM_ARROW_LV2:
case fpcNm_ITEM_ARROW_LV3:
ret = dComIfGs_getArrowMax();
break;
case PACHINKO:
case fpcNm_ITEM_PACHINKO:
ret = dComIfGs_getPachinkoMax();
break;
}
@@ -1675,105 +1675,105 @@ bool dMenu_Ring_c::checkExplainForce() {
u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], true);
for (int i = 0; i < 4; i++) {
local_18[i] = NO_ITEM;
local_18[i] = fpcNm_ITEM_NONE;
}
switch (item) {
case BOW:
case fpcNm_ITEM_BOW:
switch (item0) {
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
local_18[0] = BOMB_ARROW;
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
local_18[0] = fpcNm_ITEM_BOMB_ARROW;
break;
case HAWK_EYE:
local_18[0] = HAWK_ARROW;
case fpcNm_ITEM_HAWK_EYE:
local_18[0] = fpcNm_ITEM_HAWK_ARROW;
break;
}
switch (item1) {
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
local_18[1] = BOMB_ARROW;
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
local_18[1] = fpcNm_ITEM_BOMB_ARROW;
break;
case HAWK_EYE:
local_18[1] = HAWK_ARROW;
case fpcNm_ITEM_HAWK_EYE:
local_18[1] = fpcNm_ITEM_HAWK_ARROW;
break;
}
break;
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
if (item0 == BOW) {
local_18[0] = BOMB_ARROW;
} else if (item1 == BOW) {
local_18[1] = BOMB_ARROW;
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
if (item0 == fpcNm_ITEM_BOW) {
local_18[0] = fpcNm_ITEM_BOMB_ARROW;
} else if (item1 == fpcNm_ITEM_BOW) {
local_18[1] = fpcNm_ITEM_BOMB_ARROW;
}
break;
case HAWK_EYE:
if (item0 == BOW) {
local_18[0] = HAWK_ARROW;
} else if (item1 == BOW) {
local_18[1] = HAWK_ARROW;
case fpcNm_ITEM_HAWK_EYE:
if (item0 == fpcNm_ITEM_BOW) {
local_18[0] = fpcNm_ITEM_HAWK_ARROW;
} else if (item1 == fpcNm_ITEM_BOW) {
local_18[1] = fpcNm_ITEM_HAWK_ARROW;
}
break;
case BEE_CHILD:
if (item0 == FISHING_ROD_1) {
local_18[0] = BEE_ROD;
} else if (item1 == FISHING_ROD_1) {
local_18[1] = BEE_ROD;
case fpcNm_ITEM_BEE_CHILD:
if (item0 == fpcNm_ITEM_FISHING_ROD_1) {
local_18[0] = fpcNm_ITEM_BEE_ROD;
} else if (item1 == fpcNm_ITEM_FISHING_ROD_1) {
local_18[1] = fpcNm_ITEM_BEE_ROD;
}
break;
case WORM:
if (item0 == FISHING_ROD_1) {
local_18[0] = WORM_ROD;
} else if (item1 == FISHING_ROD_1) {
local_18[1] = WORM_ROD;
case fpcNm_ITEM_WORM:
if (item0 == fpcNm_ITEM_FISHING_ROD_1) {
local_18[0] = fpcNm_ITEM_WORM_ROD;
} else if (item1 == fpcNm_ITEM_FISHING_ROD_1) {
local_18[1] = fpcNm_ITEM_WORM_ROD;
}
break;
case ZORAS_JEWEL:
if (item0 == FISHING_ROD_1) {
local_18[0] = JEWEL_ROD;
} else if (item1 == FISHING_ROD_1) {
local_18[1] = JEWEL_ROD;
case fpcNm_ITEM_ZORAS_JEWEL:
if (item0 == fpcNm_ITEM_FISHING_ROD_1) {
local_18[0] = fpcNm_ITEM_JEWEL_ROD;
} else if (item1 == fpcNm_ITEM_FISHING_ROD_1) {
local_18[1] = fpcNm_ITEM_JEWEL_ROD;
}
break;
case FISHING_ROD_1:
if (item0 == BEE_CHILD) {
local_18[0] = BEE_ROD;
} else if (item1 == BEE_CHILD) {
local_18[1] = BEE_ROD;
} else if (item0 == ZORAS_JEWEL) {
local_18[0] = JEWEL_ROD;
} else if (item1 == ZORAS_JEWEL) {
local_18[1] = JEWEL_ROD;
} else if (item0 == WORM) {
local_18[0] = WORM_ROD;
} else if (item1 == WORM) {
local_18[1] = WORM_ROD;
case fpcNm_ITEM_FISHING_ROD_1:
if (item0 == fpcNm_ITEM_BEE_CHILD) {
local_18[0] = fpcNm_ITEM_BEE_ROD;
} else if (item1 == fpcNm_ITEM_BEE_CHILD) {
local_18[1] = fpcNm_ITEM_BEE_ROD;
} else if (item0 == fpcNm_ITEM_ZORAS_JEWEL) {
local_18[0] = fpcNm_ITEM_JEWEL_ROD;
} else if (item1 == fpcNm_ITEM_ZORAS_JEWEL) {
local_18[1] = fpcNm_ITEM_JEWEL_ROD;
} else if (item0 == fpcNm_ITEM_WORM) {
local_18[0] = fpcNm_ITEM_WORM_ROD;
} else if (item1 == fpcNm_ITEM_WORM) {
local_18[1] = fpcNm_ITEM_WORM_ROD;
}
break;
}
if (local_18[0] != NO_ITEM && local_18[1] == NO_ITEM && local_18[2] == NO_ITEM && local_18[3] == NO_ITEM &&
dComIfGs_getMixItemIndex(0) == NO_ITEM)
if (local_18[0] != fpcNm_ITEM_NONE && local_18[1] == fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE && local_18[3] == fpcNm_ITEM_NONE &&
dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE)
{
field_0x6c7[0] = local_18[0];
field_0x6c7[1] = NO_ITEM;
field_0x6c7[2] = NO_ITEM;
field_0x6c7[3] = NO_ITEM;
} else if (local_18[0] == NO_ITEM && local_18[1] != NO_ITEM && local_18[2] == NO_ITEM &&
local_18[3] == NO_ITEM && dComIfGs_getMixItemIndex(1) == NO_ITEM)
field_0x6c7[1] = fpcNm_ITEM_NONE;
field_0x6c7[2] = fpcNm_ITEM_NONE;
field_0x6c7[3] = fpcNm_ITEM_NONE;
} else if (local_18[0] == fpcNm_ITEM_NONE && local_18[1] != fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE &&
local_18[3] == fpcNm_ITEM_NONE && dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE)
{
field_0x6c7[0] = NO_ITEM;
field_0x6c7[0] = fpcNm_ITEM_NONE;
field_0x6c7[1] = local_18[1];
field_0x6c7[2] = NO_ITEM;
field_0x6c7[3] = NO_ITEM;
field_0x6c7[2] = fpcNm_ITEM_NONE;
field_0x6c7[3] = fpcNm_ITEM_NONE;
} else {
field_0x6c7[0] = NO_ITEM;
field_0x6c7[1] = NO_ITEM;
field_0x6c7[2] = NO_ITEM;
field_0x6c7[3] = NO_ITEM;
field_0x6c7[0] = fpcNm_ITEM_NONE;
field_0x6c7[1] = fpcNm_ITEM_NONE;
field_0x6c7[2] = fpcNm_ITEM_NONE;
field_0x6c7[3] = fpcNm_ITEM_NONE;
}
return 0;
}
@@ -1880,19 +1880,19 @@ void dMenu_Ring_c::setDoStatus(u8 i_doStatus) {
/* 801EEB58-801EEC98 1E9498 0140+00 1/1 0/0 0/0 .text isMixItemOn__12dMenu_Ring_cFv */
bool dMenu_Ring_c::isMixItemOn() {
if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != NO_ITEM) {
if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) {
u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
switch (item) {
case HAWK_EYE:
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == NO_ITEM) ||
case fpcNm_ITEM_HAWK_EYE:
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) ||
(dComIfGs_getMixItemIndex(0) == SLOT_4))
{
return true;
}
if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == NO_ITEM) ||
if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) ||
(dComIfGs_getMixItemIndex(1) == SLOT_4))
{
return true;
@@ -1905,7 +1905,7 @@ bool dMenu_Ring_c::isMixItemOn() {
/* 801EEC98-801EED84 1E95D8 00EC+00 1/1 0/0 0/0 .text isMixItemOff__12dMenu_Ring_cFv */
bool dMenu_Ring_c::isMixItemOff() {
if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != NO_ITEM)) {
if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != fpcNm_ITEM_NONE)) {
if ((dComIfGs_getMixItemIndex(0) == SLOT_4) &&
(mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0)))
{
src/d/d_menu_save.cpp
+2 -2
View File
@@ -1601,8 +1601,8 @@ void dMenu_save_c::restartInit() {
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); // Monkey dropped lantern
}
if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) {
dComIfGs_setItem(SLOT_1, KANTERA);
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) {
dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA);
dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp());
}
src/d/d_menu_window_HIO.cpp
+8 -8
View File
@@ -13,9 +13,9 @@ dMw_HIO_c::dMw_HIO_c() {
/* 801F9B38-801F9E14 1F4478 02DC+00 1/1 0/0 0/0 .text init__9dMw_HIO_cFv */
void dMw_HIO_c::init() {
static u8 m_cloth_item[3] = {WEAR_KOKIRI, ARMOR, WEAR_ZORA};
static u8 m_sword_item[4] = {SWORD, MASTER_SWORD, LIGHT_SWORD, WOOD_STICK};
static u8 m_shield_item[3] = {SHIELD, HYLIA_SHIELD, WOOD_SHIELD};
static u8 m_cloth_item[3] = {fpcNm_ITEM_WEAR_KOKIRI, fpcNm_ITEM_ARMOR, fpcNm_ITEM_WEAR_ZORA};
static u8 m_sword_item[4] = {fpcNm_ITEM_SWORD, fpcNm_ITEM_MASTER_SWORD, fpcNm_ITEM_LIGHT_SWORD, fpcNm_ITEM_WOOD_STICK};
static u8 m_shield_item[3] = {fpcNm_ITEM_SHIELD, fpcNm_ITEM_HYLIA_SHIELD, fpcNm_ITEM_WOOD_SHIELD};
mArrowFlag = 0;
mBombFlag = 0;
@@ -57,8 +57,8 @@ void dMw_HIO_c::init() {
mDonationAmount = 0;
for (int i = 0; i < 24; i++) {
mItemsCopy[i] = NO_ITEM;
mItems[i] = NO_ITEM;
mItemsCopy[i] = fpcNm_ITEM_NONE;
mItems[i] = fpcNm_ITEM_NONE;
field_0x7a[i] = 0;
}
@@ -72,8 +72,8 @@ void dMw_HIO_c::init() {
mBombNum[i] = 0;
}
mScentCopy = NO_ITEM;
mScent = NO_ITEM;
mScentCopy = fpcNm_ITEM_NONE;
mScent = fpcNm_ITEM_NONE;
field_0xa8 = 0;
field_0xf4 = 0;
field_0xea = 0;
@@ -171,4 +171,4 @@ dMw_DHIO_c::dMw_DHIO_c() {
dMw_HIO_c g_mwHIO;
/* 8042E9A8-8042EBB0 05B6C8 0208+00 0/1 1/1 0/0 .bss g_mwDHIO */
dMw_DHIO_c g_mwDHIO;
dMw_DHIO_c g_mwDHIO;
src/d/d_meter2.cpp
+36 -36
View File
@@ -188,22 +188,22 @@ int dMeter2_c::_create() {
for (int i = 0; i < 2; i++) {
if (field_0x128 == 0) {
if (mItemStatus[i * 2] == BOMB_BAG_LV1 || mItemStatus[i * 2] == NORMAL_BOMB ||
mItemStatus[i * 2] == WATER_BOMB || mItemStatus[i * 2] == POKE_BOMB)
if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB ||
mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB)
{
mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i),
dComIfGp_getSelectItemMaxNum(i));
} else if (mItemStatus[i * 2] == BEE_CHILD) {
} else if (mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD) {
mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i),
dComIfGp_getSelectItemMaxNum(i));
} else if (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW ||
mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 ||
mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == HAWK_ARROW)
} else if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW ||
mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 ||
mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW)
{
mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax());
} else if (mItemStatus[i * 2] == PACHINKO) {
} else if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) {
mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax());
} else if (mItemStatus[i * 2] == BOMB_ARROW) {
} else if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW) {
u8 item_num = dComIfGp_getSelectItemNum(i);
u8 item_max = dComIfGp_getSelectItemMaxNum(i);
if (item_num > mArrowNum) {
@@ -2499,7 +2499,7 @@ void dMeter2_c::moveBombNum() {
temp_r31 = dComIfGs_getItem((u8)(i + SLOT_15), true);
temp_r28 = dComIfGs_getItem((u8)(i + SLOT_15), false);
if (temp_r31 != NO_ITEM && temp_r31 != BOMB_BAG_LV1) {
if (temp_r31 != fpcNm_ITEM_NONE && temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) {
if (g_mwHIO.getBombFlag() ||
(dMeter2Info_getMiniGameItemSetFlag() == 1 && i == dMeter2Info_getRentalBombBag()))
{
@@ -2527,7 +2527,7 @@ void dMeter2_c::moveBombNum() {
}
if (var_r22 == 0) {
if (temp_r31 == BOMB_ARROW) {
if (temp_r31 == fpcNm_ITEM_BOMB_ARROW) {
for (int j = 0; j < 2; j++) {
if (i + SLOT_15 == dComIfGs_getSelectItemIndex(j) ||
i + SLOT_15 == dComIfGs_getMixItemIndex(j))
@@ -2538,8 +2538,8 @@ void dMeter2_c::moveBombNum() {
}
}
}
dComIfGs_setItem(i + SLOT_15, BOMB_BAG_LV1);
dComIfGp_setItem(i + SLOT_15, BOMB_BAG_LV1);
dComIfGs_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1);
dComIfGp_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1);
for (int j = 0; j < 2; j++) {
if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) {
@@ -2551,7 +2551,7 @@ void dMeter2_c::moveBombNum() {
dComIfGs_setBombNum(i, var_r22);
mBombMax[i] = dComIfGs_getBombMax(temp_r28);
if (temp_r31 != BOMB_ARROW) {
if (temp_r31 != fpcNm_ITEM_BOMB_ARROW) {
for (int j = 0; j < 2; j++) {
if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) {
mpMeterDraw->setItemNum(j, dComIfGp_getSelectItemNum(j),
@@ -2561,7 +2561,7 @@ void dMeter2_c::moveBombNum() {
}
}
} else {
if (temp_r31 != BOMB_BAG_LV1) {
if (temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) {
dComIfGs_setBombNum(i, 0);
}
@@ -2592,7 +2592,7 @@ void dMeter2_c::moveBombNum() {
/* 80224258-80224354 21EB98 00FC+00 1/1 0/0 0/0 .text moveBottleNum__9dMeter2_cFv */
void dMeter2_c::moveBottleNum() {
for (int i = 0; i < 4; i++) {
if (dComIfGs_getItem((u8)(i + SLOT_11), true) == BEE_CHILD) {
if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_BEE_CHILD) {
if (mBottleNum[i] != dComIfGs_getBottleNum(i)) {
for (int j = 0; j < 2; j++) {
if (i + SLOT_11 == dComIfGs_getSelectItemIndex(j)) {
@@ -2668,14 +2668,14 @@ void dMeter2_c::moveArrowNum() {
i = 0;
var_r28 = 0;
for (; i < 2; i++, var_r28 += 2) {
if (mItemStatus[var_r28] == BOW || mItemStatus[var_r28] == LIGHT_ARROW ||
mItemStatus[var_r28] == ARROW_LV1 || mItemStatus[var_r28] == ARROW_LV2 ||
mItemStatus[var_r28] == ARROW_LV3 || mItemStatus[var_r28] == HAWK_ARROW)
if (mItemStatus[var_r28] == fpcNm_ITEM_BOW || mItemStatus[var_r28] == fpcNm_ITEM_LIGHT_ARROW ||
mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV2 ||
mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[var_r28] == fpcNm_ITEM_HAWK_ARROW)
{
mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax());
} else if (mItemStatus[var_r28] == PACHINKO) {
} else if (mItemStatus[var_r28] == fpcNm_ITEM_PACHINKO) {
mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax());
} else if (mItemStatus[var_r28] == BOMB_ARROW) {
} else if (mItemStatus[var_r28] == fpcNm_ITEM_BOMB_ARROW) {
var_r27 = dComIfGp_getSelectItemNum(i);
var_r6_2 = dComIfGp_getSelectItemMaxNum(i);
@@ -2750,7 +2750,7 @@ void dMeter2_c::movePachinkoNum() {
}
for (int i = 0; i < 2; i++) {
if (mItemStatus[i * 2] == PACHINKO) {
if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) {
mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax());
}
}
@@ -2777,7 +2777,7 @@ void dMeter2_c::alphaAnimeLife() {
/* 80224A04-80224BAC 21F344 01A8+00 1/1 0/0 0/0 .text alphaAnimeKantera__9dMeter2_cFv */
void dMeter2_c::alphaAnimeKantera() {
if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != KANTERA ||
if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != fpcNm_ITEM_KANTERA ||
!daPy_getPlayerActorClass()->checkUseKandelaar(0) || (mStatus & 0x4000) ||
((mStatus & 0x40) && dComIfGp_event_checkHind(0x400)) || dComIfGp_getOxygenShowFlag() ||
((daPy_getPlayerActorClass()->getSumouMode() != 0) ||
@@ -2940,20 +2940,20 @@ void dMeter2_c::alphaAnimeButton() {
field_0x128 == 0 ? true : false);
if (field_0x128 == 0 && dMeter2Info_getMiniGameItemSetFlag() != 1 &&
(mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW ||
mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 ||
mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == BOMB_BAG_LV1 ||
mItemStatus[i * 2] == NORMAL_BOMB || mItemStatus[i * 2] == WATER_BOMB ||
mItemStatus[i * 2] == POKE_BOMB || mItemStatus[i * 2] == HAWK_ARROW ||
mItemStatus[i * 2] == BOMB_ARROW || mItemStatus[i * 2] == PACHINKO ||
mItemStatus[i * 2] == BEE_CHILD))
(mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW ||
mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 ||
mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 ||
mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB ||
mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW ||
mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW || mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO ||
mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD))
{
mpMeterDraw->drawItemNum(i, 1.0f);
} else {
mpMeterDraw->drawItemNum(i, 0.0f);
}
if (field_0x128 == 0 && mItemStatus[i * 2] == KANTERA) {
if (field_0x128 == 0 && mItemStatus[i * 2] == fpcNm_ITEM_KANTERA) {
mpMeterDraw->drawKanteraMeter(i, 1.0f);
} else {
mpMeterDraw->drawKanteraMeter(i, 0.0f);
@@ -3065,10 +3065,10 @@ u8 dMeter2_c::isKeyVisible() {
/* 802259F8-80225A64 220338 006C+00 2/2 0/0 0/0 .text isArrowEquip__9dMeter2_cFv */
int dMeter2_c::isArrowEquip() {
for (int i = 0; i < 2; i++) {
if (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW ||
mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 ||
mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == HAWK_ARROW ||
mItemStatus[i * 2] == BOMB_ARROW)
if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW ||
mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 ||
mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW ||
mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW)
{
return i + 1;
}
@@ -3079,7 +3079,7 @@ int dMeter2_c::isArrowEquip() {
/* 80225A64-80225AA0 2203A4 003C+00 2/2 0/0 0/0 .text isPachinkoEquip__9dMeter2_cFv */
int dMeter2_c::isPachinkoEquip() {
for (int i = 0; i < 2; i++) {
if (mItemStatus[i * 2] == PACHINKO) {
if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) {
return i + 1;
}
}
@@ -3148,4 +3148,4 @@ SECTION_DATA extern msg_process_profile_definition g_profile_METER2 = {
&g_fopMsg_Method,
0x0301,
&l_dMeter2_Method,
};
};
src/d/d_meter2_draw.cpp
+53 -53
View File
@@ -1173,7 +1173,7 @@ void dMeter2Draw_c::initButton() {
}
}
mButtonBItem = SWORD;
mButtonBItem = fpcNm_ITEM_SWORD;
changeTextureItemB(mButtonBItem);
for (int i = 0; i < 2; i++) {
@@ -2362,10 +2362,10 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
mButtonBItem = dComIfGs_getSelectEquipSword();
switch (dComIfGs_getSelectEquipSword()) {
case WOOD_STICK:
case SWORD:
case MASTER_SWORD:
case LIGHT_SWORD:
case fpcNm_ITEM_WOOD_STICK:
case fpcNm_ITEM_SWORD:
case fpcNm_ITEM_MASTER_SWORD:
case fpcNm_ITEM_LIGHT_SWORD:
changeTextureItemB(mButtonBItem);
break;
default:
@@ -2375,8 +2375,8 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
}
} else if (param_1 == true && i_action == 0x4F) {
mpScreen->search('item_b_n')->show();
mButtonBItem = LURE_ROD;
changeTextureItemB(LURE_ROD);
mButtonBItem = fpcNm_ITEM_LURE_ROD;
changeTextureItemB(fpcNm_ITEM_LURE_ROD);
var_r31 = 2;
} else {
mpScreen->search('item_b_n')->hide();
@@ -2483,7 +2483,7 @@ void dMeter2Draw_c::drawButtonS(u8 i_action) {
void dMeter2Draw_c::drawButtonBin(u8 i_action) {
int bottle_num = 0;
for (int i = 0; i < 4; i++) {
if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != NO_ITEM) {
if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != fpcNm_ITEM_NONE) {
bottle_num++;
}
}
@@ -2558,7 +2558,7 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_
mpTextXY[i_no]->hide();
int var_r29;
if (i_itemNo == NO_ITEM || i_itemNo == 0) {
if (i_itemNo == fpcNm_ITEM_NONE || i_itemNo == 0) {
mpScreen->search(tag[i_no])->hide();
var_r29 = 1;
} else {
@@ -3375,10 +3375,10 @@ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) {
/* 8021A468-8021A71C 214DA8 02B4+00 2/2 0/0 0/0 .text changeTextureItemB__13dMeter2Draw_cFUc */
void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) {
int var_r31 = 0;
if (i_itemNo == LURE_ROD) {
if (i_itemNo == fpcNm_ITEM_LURE_ROD) {
var_r31 = 2;
} else if (i_itemNo == SWORD || i_itemNo == MASTER_SWORD || i_itemNo == WOOD_STICK ||
i_itemNo == LIGHT_SWORD)
} else if (i_itemNo == fpcNm_ITEM_SWORD || i_itemNo == fpcNm_ITEM_MASTER_SWORD || i_itemNo == fpcNm_ITEM_WOOD_STICK ||
i_itemNo == fpcNm_ITEM_LIGHT_SWORD)
{
var_r31 = 1;
}
@@ -3421,8 +3421,8 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) {
void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) {
JUT_ASSERT(i_no < SELECT_MAX_e);
if (i_itemNo == LIGHT_ARROW) {
i_itemNo = BOW;
if (i_itemNo == fpcNm_ITEM_LIGHT_ARROW) {
i_itemNo = fpcNm_ITEM_BOW;
}
if (field_0x76c[i_no] == 0) {
@@ -3625,7 +3625,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale;
} else {
switch (i_itemNo) {
case BOOMERANG:
case fpcNm_ITEM_BOOMERANG:
mItemParams[SELECT_X_e].pos_x = 4.0f;
mItemParams[SELECT_X_e].pos_y = -11.0f;
mItemParams[SELECT_X_e].scale = 1.7f;
@@ -3634,7 +3634,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
mItemParams[SELECT_X_e].num_pos_y = -9.2f;
mItemParams[SELECT_X_e].num_scale = 0.95f;
break;
case BOW:
case fpcNm_ITEM_BOW:
mItemParams[SELECT_X_e].pos_x = 9.2f;
mItemParams[SELECT_X_e].pos_y = -14.0f;
mItemParams[SELECT_X_e].scale = 2.0f;
@@ -3643,7 +3643,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
mItemParams[SELECT_X_e].num_pos_y = -9.2f;
mItemParams[SELECT_X_e].num_scale = 0.95f;
break;
case HVY_BOOTS:
case fpcNm_ITEM_HVY_BOOTS:
mItemParams[SELECT_X_e].pos_x = 4.0f;
mItemParams[SELECT_X_e].pos_y = -14.0f;
mItemParams[SELECT_X_e].scale = 1.7f;
@@ -3652,7 +3652,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
mItemParams[SELECT_X_e].num_pos_y = -9.2f;
mItemParams[SELECT_X_e].num_scale = 0.95f;
break;
case HOOKSHOT:
case fpcNm_ITEM_HOOKSHOT:
mItemParams[SELECT_X_e].pos_x = 17.0f;
mItemParams[SELECT_X_e].pos_y = -14.0f;
mItemParams[SELECT_X_e].scale = 1.5f;
@@ -3661,7 +3661,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
mItemParams[SELECT_X_e].num_pos_y = -9.2f;
mItemParams[SELECT_X_e].num_scale = 0.95f;
break;
case KANTERA:
case fpcNm_ITEM_KANTERA:
mItemParams[SELECT_X_e].pos_x = -2.0f;
mItemParams[SELECT_X_e].pos_y = -15.0f;
mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale;
@@ -3706,7 +3706,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale;
} else {
switch (i_itemNo) {
case BOOMERANG:
case fpcNm_ITEM_BOOMERANG:
mItemParams[SELECT_Y_e].pos_x = 14.0f;
mItemParams[SELECT_Y_e].pos_y = 1.3f;
mItemParams[SELECT_Y_e].scale = 1.7f;
@@ -3715,7 +3715,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
mItemParams[SELECT_Y_e].num_scale = 0.95f;
break;
case BOW:
case fpcNm_ITEM_BOW:
mItemParams[SELECT_Y_e].pos_x = -1.3f;
mItemParams[SELECT_Y_e].pos_y = -6.6f;
mItemParams[SELECT_Y_e].scale = 2.0f;
@@ -3724,7 +3724,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
mItemParams[SELECT_Y_e].num_scale = 0.95f;
break;
case HVY_BOOTS:
case fpcNm_ITEM_HVY_BOOTS:
mItemParams[SELECT_Y_e].pos_x = 1.3f;
mItemParams[SELECT_Y_e].pos_y = 1.3f;
mItemParams[SELECT_Y_e].scale = 1.7f;
@@ -3733,7 +3733,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
mItemParams[SELECT_Y_e].num_scale = 0.95f;
break;
case HOOKSHOT:
case fpcNm_ITEM_HOOKSHOT:
mItemParams[SELECT_Y_e].pos_x = 6.6f;
mItemParams[SELECT_Y_e].pos_y = -4.0f;
mItemParams[SELECT_Y_e].scale = 1.5f;
@@ -3742,7 +3742,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
mItemParams[SELECT_Y_e].num_scale = 0.95f;
break;
case KANTERA:
case fpcNm_ITEM_KANTERA:
mItemParams[SELECT_Y_e].pos_x = -1.8f;
mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY;
mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale;
@@ -3787,7 +3787,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218;
} else {
switch (i_itemNo) {
case BOOMERANG:
case fpcNm_ITEM_BOOMERANG:
mItemParams[SELECT_Z_e].pos_x = 4.0f;
mItemParams[SELECT_Z_e].pos_y = 1.3f;
mItemParams[SELECT_Z_e].scale = 2.2f;
@@ -3796,7 +3796,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
mItemParams[SELECT_Z_e].num_scale = 0.75f;
break;
case BOW:
case fpcNm_ITEM_BOW:
mItemParams[SELECT_Z_e].pos_x = -1.3f;
mItemParams[SELECT_Z_e].pos_y = 1.3f;
mItemParams[SELECT_Z_e].scale = 2.2f;
@@ -3805,7 +3805,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
mItemParams[SELECT_Z_e].num_scale = 0.75f;
break;
case HVY_BOOTS:
case fpcNm_ITEM_HVY_BOOTS:
mItemParams[SELECT_Z_e].pos_x = -6.6f;
mItemParams[SELECT_Z_e].pos_y = 9.2f;
mItemParams[SELECT_Z_e].scale = 2.2f;
@@ -3814,7 +3814,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
mItemParams[SELECT_Z_e].num_scale = 0.8f;
break;
case HOOKSHOT:
case fpcNm_ITEM_HOOKSHOT:
mItemParams[SELECT_Z_e].pos_x = -4.0f;
mItemParams[SELECT_Z_e].pos_y = 1.3f;
mItemParams[SELECT_Z_e].scale = 1.7f;
@@ -3823,7 +3823,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
mItemParams[SELECT_Z_e].num_scale = 0.8f;
break;
case KANTERA:
case fpcNm_ITEM_KANTERA:
mItemParams[SELECT_Z_e].pos_x = -6.6f;
mItemParams[SELECT_Z_e].pos_y = 6.6f;
mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4;
@@ -3877,13 +3877,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_scale = 0.75f;
} else {
switch (i_itemNo) {
case LURE_ROD:
case BEE_ROD:
case JEWEL_ROD:
case JEWEL_BEE_ROD:
case JEWEL_WORM_ROD:
case HORSE_FLUTE:
case FISHING_ROD_1:
case fpcNm_ITEM_LURE_ROD:
case fpcNm_ITEM_BEE_ROD:
case fpcNm_ITEM_JEWEL_ROD:
case fpcNm_ITEM_JEWEL_BEE_ROD:
case fpcNm_ITEM_JEWEL_WORM_ROD:
case fpcNm_ITEM_HORSE_FLUTE:
case fpcNm_ITEM_FISHING_ROD_1:
mItemParams[3].pos_x = 17.3f;
mItemParams[3].pos_y = -46.8f;
mItemParams[3].scale = 1.7f;
@@ -3892,7 +3892,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -30.0f;
mItemParams[3].num_scale = 0.75f;
break;
case BOOMERANG:
case fpcNm_ITEM_BOOMERANG:
mItemParams[3].pos_x = 26.0f;
mItemParams[3].pos_y = -54.7f;
mItemParams[3].scale = 2.2f;
@@ -3901,7 +3901,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -30.0f;
mItemParams[3].num_scale = 0.75f;
break;
case BOW:
case fpcNm_ITEM_BOW:
mItemParams[3].pos_x = 20.7f;
mItemParams[3].pos_y = -55.7f;
mItemParams[3].scale = 2.2f;
@@ -3910,7 +3910,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -30.0f;
mItemParams[3].num_scale = 0.75f;
break;
case HVY_BOOTS:
case fpcNm_ITEM_HVY_BOOTS:
mItemParams[3].pos_x = 15.4f;
mItemParams[3].pos_y = -47.8f;
mItemParams[3].scale = 2.2f;
@@ -3919,8 +3919,8 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -30.0f;
mItemParams[3].num_scale = 0.8f;
break;
case SPINNER:
case HAWK_EYE:
case fpcNm_ITEM_SPINNER:
case fpcNm_ITEM_HAWK_EYE:
mItemParams[3].pos_x = 23.3f;
mItemParams[3].pos_y = -47.8f;
mItemParams[3].scale = 1.7f;
@@ -3929,9 +3929,9 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -30.0f;
mItemParams[3].num_scale = 0.8f;
break;
case COPY_ROD:
case W_HOOKSHOT:
case IRONBALL:
case fpcNm_ITEM_COPY_ROD:
case fpcNm_ITEM_W_HOOKSHOT:
case fpcNm_ITEM_IRONBALL:
mItemParams[3].pos_x = 29.3f;
mItemParams[3].pos_y = -47.8f;
mItemParams[3].scale = 1.7f;
@@ -3940,13 +3940,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -30.0f;
mItemParams[3].num_scale = 0.8f;
break;
case PACHINKO:
case BOMB_BAG_LV1:
case NORMAL_BOMB:
case WATER_BOMB:
case POKE_BOMB:
case RAFRELS_MEMO:
case TKS_LETTER:
case fpcNm_ITEM_PACHINKO:
case fpcNm_ITEM_BOMB_BAG_LV1:
case fpcNm_ITEM_NORMAL_BOMB:
case fpcNm_ITEM_WATER_BOMB:
case fpcNm_ITEM_POKE_BOMB:
case fpcNm_ITEM_RAFRELS_MEMO:
case fpcNm_ITEM_TKS_LETTER:
mItemParams[3].pos_x = 20.3f;
mItemParams[3].pos_y = -47.8f;
mItemParams[3].scale = 1.7f;
@@ -3955,7 +3955,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -22.0f;
mItemParams[3].num_scale = 0.8f;
break;
case HOOKSHOT:
case fpcNm_ITEM_HOOKSHOT:
mItemParams[3].pos_x = 21.0f;
mItemParams[3].pos_y = -46.7f;
mItemParams[3].scale = 1.7f;
@@ -3964,7 +3964,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
mItemParams[3].num_pos_y = -30.0f;
mItemParams[3].num_scale = 0.8f;
break;
case KANTERA:
case fpcNm_ITEM_KANTERA:
mItemParams[3].pos_x = 19.0f;
mItemParams[3].pos_y = -45.0f;
mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0];
src/d/d_meter2_info.cpp
+83 -83
View File
@@ -344,8 +344,8 @@ void dMeter2Info_c::warpInProc() {
dComIfGs_setWarpMarkFlag(0);
dComIfGs_resetLastWarpAcceptStage();
if (dComIfGs_getItem(SLOT_18, true) != LV7_DUNGEON_EXIT) {
dComIfGs_setItem(SLOT_18, DUNGEON_EXIT);
if (dComIfGs_getItem(SLOT_18, true) != fpcNm_ITEM_LV7_DUNGEON_EXIT) {
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT);
}
}
@@ -379,7 +379,7 @@ void dMeter2Info_c::warpOutProc() {
}
dComIfGs_setWarpItemData(dComIfGp_getStartStageName(), warpPos, warpAngle.y, warpRoomNo, 0, 1);
dComIfGs_setItem(SLOT_18, DUNGEON_BACK);
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK);
}
/* 8021CC00-8021CC0C 217540 000C+00 0/0 1/1 1/1 .text resetMeterString__13dMeter2Info_cFv
@@ -496,9 +496,9 @@ int dMeter2Info_c::readItemTexture(u8 itemNo, void* param_1, J2DPicture* param_2
int ret = 0;
if (param_1 != NULL) {
if ((itemNo == KANTERA && dComIfGs_getOil() == 0) || itemNo == KANTERA2) {
if ((itemNo == fpcNm_ITEM_KANTERA && dComIfGs_getOil() == 0) || itemNo == fpcNm_ITEM_KANTERA2) {
dComIfGp_getItemIconArchive()->readIdxResource(param_1, 0xC00, 0x23);
} else if (itemNo == COPY_ROD && !daPy_getPlayerActorClass()->checkCopyRodTopUse() &&
} else if (itemNo == fpcNm_ITEM_COPY_ROD && !daPy_getPlayerActorClass()->checkCopyRodTopUse() &&
param_9 == -1)
{
dComIfGp_getItemIconArchive()->readIdxResource(param_1, 0xC00, 0x57);
@@ -605,51 +605,51 @@ void dMeter2Info_c::setItemColor(u8 param_1, J2DPicture* param_2, J2DPicture* pa
*/
s16 dMeter2Info_c::get2ndTexture(u8 itemType) {
switch (itemType) {
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case SILVER_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
return 0x2e;
case S_MAGIC:
case L_MAGIC:
case BOMB_5:
case BOMB_10:
case BOMB_20:
case BOMB_30:
case ARROW_10:
case ARROW_20:
case ARROW_30:
case ARROW_1:
case PACHINKO_SHOT:
case noentry1:
case noentry2:
case noentry3:
case WATER_BOMB_5:
case WATER_BOMB_10:
case WATER_BOMB_20:
case WATER_BOMB_30:
case BOMB_INSECT_5:
case TRIPLE_HEART:
case fpcNm_ITEM_S_MAGIC:
case fpcNm_ITEM_L_MAGIC:
case fpcNm_ITEM_BOMB_5:
case fpcNm_ITEM_BOMB_10:
case fpcNm_ITEM_BOMB_20:
case fpcNm_ITEM_BOMB_30:
case fpcNm_ITEM_ARROW_10:
case fpcNm_ITEM_ARROW_20:
case fpcNm_ITEM_ARROW_30:
case fpcNm_ITEM_ARROW_1:
case fpcNm_ITEM_PACHINKO_SHOT:
case fpcNm_ITEM_NOENTRY_19:
case fpcNm_ITEM_NOENTRY_20:
case fpcNm_ITEM_NOENTRY_21:
case fpcNm_ITEM_WATER_BOMB_5:
case fpcNm_ITEM_WATER_BOMB_10:
case fpcNm_ITEM_WATER_BOMB_20:
case fpcNm_ITEM_WATER_BOMB_30:
case fpcNm_ITEM_BOMB_INSECT_5:
case fpcNm_ITEM_TRIPLE_HEART:
return 0xe;
case BOMB_INSECT_10:
case fpcNm_ITEM_BOMB_INSECT_10:
return 0x14;
case BOMB_INSECT_20:
case fpcNm_ITEM_BOMB_INSECT_20:
return 0x27;
case BOMB_INSECT_30:
case fpcNm_ITEM_BOMB_INSECT_30:
return 0xf;
case RECOVERY_FAILY:
case fpcNm_ITEM_RECOVERY_FAILY:
return 0x10;
case KAKERA_HEART:
case UTAWA_HEART:
case MAP:
case fpcNm_ITEM_KAKERA_HEART:
case fpcNm_ITEM_UTAWA_HEART:
case fpcNm_ITEM_MAP:
return 0x69;
case COMPUS:
case fpcNm_ITEM_COMPUS:
return 0x2a;
default:
case SMALL_KEY:
case fpcNm_ITEM_SMALL_KEY:
return -1;
}
}
@@ -658,18 +658,18 @@ s16 dMeter2Info_c::get2ndTexture(u8 itemType) {
*/
s16 dMeter2Info_c::get3rdTexture(u8 itemType) {
switch (itemType) {
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case SILVER_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
return 0x2e;
case BOMB_INSECT_10:
case BOMB_INSECT_20:
case BOMB_INSECT_30:
case RECOVERY_FAILY:
case fpcNm_ITEM_BOMB_INSECT_10:
case fpcNm_ITEM_BOMB_INSECT_20:
case fpcNm_ITEM_BOMB_INSECT_30:
case fpcNm_ITEM_RECOVERY_FAILY:
return 0x0e;
default:
return -1;
@@ -680,13 +680,13 @@ s16 dMeter2Info_c::get3rdTexture(u8 itemType) {
*/
s16 dMeter2Info_c::get4thTexture(u8 itemType) {
switch (itemType) {
case GREEN_RUPEE:
case BLUE_RUPEE:
case YELLOW_RUPEE:
case RED_RUPEE:
case PURPLE_RUPEE:
case ORANGE_RUPEE:
case SILVER_RUPEE:
case fpcNm_ITEM_GREEN_RUPEE:
case fpcNm_ITEM_BLUE_RUPEE:
case fpcNm_ITEM_YELLOW_RUPEE:
case fpcNm_ITEM_RED_RUPEE:
case fpcNm_ITEM_PURPLE_RUPEE:
case fpcNm_ITEM_ORANGE_RUPEE:
case fpcNm_ITEM_SILVER_RUPEE:
return 0x2e;
default:
return -1;
@@ -963,8 +963,8 @@ void dMeter2Info_c::changeWater(u8 i_slotNo) {
int i_bottleIdx = i_slotNo - SLOT_11;
mHotSpringTimer[i_bottleIdx] = 0;
if (dComIfGs_getItem(i_slotNo, true) == HOT_SPRING) {
dComIfGs_setItem(i_slotNo, WATER_BOTTLE);
if (dComIfGs_getItem(i_slotNo, true) == fpcNm_ITEM_HOT_SPRING) {
dComIfGs_setItem(i_slotNo, fpcNm_ITEM_WATER_BOTTLE);
for (int i = 0; i < 3; i++) {
if (i_slotNo == dComIfGs_getSelectItemIndex(i)) {
@@ -987,7 +987,7 @@ void dMeter2Info_c::setMiniGameItem(u8 minigameFlag) {
bool setRentBagIdx = false;
for (int bagIdx = 0; bagIdx < 3; bagIdx++) {
if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == NO_ITEM) {
if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == fpcNm_ITEM_NONE) {
mRentalBombBagIdx = bagIdx;
setRentBagIdx = true;
}
@@ -1022,12 +1022,12 @@ void dMeter2Info_c::setMiniGameItem(u8 minigameFlag) {
dComIfGs_setArrowNum(mSaveArrowNumMG);
}
dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), NORMAL_BOMB);
dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), NORMAL_BOMB);
dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB);
dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB);
if (mMiniGameItemSetFlag != 3) {
dComIfGs_setItem(SLOT_4, BOW);
dComIfGp_setItem(SLOT_4, BOW);
dComIfGs_setItem(SLOT_4, fpcNm_ITEM_BOW);
dComIfGp_setItem(SLOT_4, fpcNm_ITEM_BOW);
dComIfGs_setMixItemIndex(SELECT_ITEM_Y, 0xFF);
dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, 0xFF);
dComIfGs_setMixItemIndex(SELECT_ITEM_X, SLOT_4);
@@ -1131,17 +1131,17 @@ bool dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f3
/* 8021E4B0-8021E530 218DF0 0080+00 0/0 2/2 1/1 .text dMeter2Info_setCloth__FUcb */
void dMeter2Info_setCloth(u8 i_clothId, bool param_1) {
switch (i_clothId) {
case WEAR_CASUAL:
case WEAR_KOKIRI:
case ARMOR:
case WEAR_ZORA:
case fpcNm_ITEM_WEAR_CASUAL:
case fpcNm_ITEM_WEAR_KOKIRI:
case fpcNm_ITEM_ARMOR:
case fpcNm_ITEM_WEAR_ZORA:
break;
default:
i_clothId = WEAR_CASUAL;
i_clothId = fpcNm_ITEM_WEAR_CASUAL;
param_1 = false;
}
if (param_1 && dComIfGs_getSelectEquipClothes() != NO_ITEM) {
if (param_1 && dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_NONE) {
u8 equip_cloth = dComIfGs_getSelectEquipClothes();
dComIfGs_offItemFirstBit(equip_cloth);
}
@@ -1152,14 +1152,14 @@ void dMeter2Info_setCloth(u8 i_clothId, bool param_1) {
/* 8021E530-8021E5D4 218E70 00A4+00 0/0 3/3 3/3 .text dMeter2Info_setSword__FUcb */
void dMeter2Info_setSword(u8 i_itemId, bool param_1) {
switch (i_itemId) {
case NO_ITEM:
case WOOD_STICK:
case SWORD:
case MASTER_SWORD:
case LIGHT_SWORD:
case fpcNm_ITEM_NONE:
case fpcNm_ITEM_WOOD_STICK:
case fpcNm_ITEM_SWORD:
case fpcNm_ITEM_MASTER_SWORD:
case fpcNm_ITEM_LIGHT_SWORD:
break;
default:
i_itemId = NO_ITEM;
i_itemId = fpcNm_ITEM_NONE;
param_1 = false;
}
@@ -1174,13 +1174,13 @@ void dMeter2Info_setSword(u8 i_itemId, bool param_1) {
/* 8021E5D4-8021E660 218F14 008C+00 0/0 3/3 0/0 .text dMeter2Info_setShield__FUcb */
void dMeter2Info_setShield(u8 i_itemId, bool param_1) {
switch (i_itemId) {
case NO_ITEM:
case WOOD_SHIELD:
case SHIELD:
case HYLIA_SHIELD:
case fpcNm_ITEM_NONE:
case fpcNm_ITEM_WOOD_SHIELD:
case fpcNm_ITEM_SHIELD:
case fpcNm_ITEM_HYLIA_SHIELD:
break;
default:
i_itemId = NO_ITEM;
i_itemId = fpcNm_ITEM_NONE;
param_1 = false;
}
src/d/d_meter_HIO.cpp
+2 -2
View File
@@ -1311,7 +1311,7 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
mCannonBallZoomScale[1] = 0.8f;
mLV5DungeonItemDebug = false;
mLV5DungeonItem = NO_ITEM;
mLV5DungeonItem = fpcNm_ITEM_NONE;
mIconDebug = false;
for (int i = 0; i < ARRAY_SIZE(mIconDisplay); i++) {
@@ -1554,4 +1554,4 @@ dMeter_ringHIO_c g_ringHIO;
dMeter_fmapHIO_c g_fmapHIO;
/* 80430110-80430158 05CE30 0044+04 0/1 6/6 1/1 .bss g_cursorHIO */
dMeter_cursorHIO_c g_cursorHIO;
dMeter_cursorHIO_c g_cursorHIO;
src/d/d_meter_button.cpp
+4 -4
View File
@@ -1178,11 +1178,11 @@ void dMeterButton_c::screenInitButton() {
u8 fishing_item = dComIfGs_getItem(SLOT_20, false);
if (dMeter2Info_getMeterClass()->getMeterDrawPtr()->getCanoeFishing()) {
fishing_item = LURE_ROD;
fishing_item = fpcNm_ITEM_LURE_ROD;
}
if (fishing_item == NO_ITEM) {
fishing_item = FISHING_ROD_1;
if (fishing_item == fpcNm_ITEM_NONE) {
fishing_item = fpcNm_ITEM_FISHING_ROD_1;
}
dMeter2Info_readItemTexture(fishing_item, mpFishingTex,
@@ -3368,4 +3368,4 @@ void dMeterButton_c::pikariCheck() {
*/
void dMeterButton_c::paneTrans(CPaneMgr* i_pane, f32 i_transX, f32 i_transY, u8 unused) {
i_pane->paneTrans(i_transX, i_transY);
}
}
src/d/d_msg_class.cpp
+4 -4
View File
@@ -1646,12 +1646,12 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz
push_word(bomb_price_text);
return true;
case 0x37:
u8 bomb_type = NORMAL_BOMB;
u8 bomb_type = fpcNm_ITEM_NORMAL_BOMB;
if (*(u8*)i_data == 1) {
bomb_type = WATER_BOMB;
bomb_type = fpcNm_ITEM_WATER_BOMB;
} else if (*(u8*)i_data == 2) {
bomb_type = POKE_BOMB;
bomb_type = fpcNm_ITEM_POKE_BOMB;
}
char bomb_max_text[40];
@@ -3877,4 +3877,4 @@ SECTION_DATA extern void* __vt__19jmessage_tReference[4 + 1 /* padding */] = {
NULL,
};
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_msg_flow.cpp
+45 -45
View File
@@ -919,7 +919,7 @@ int dMsgFlow_c::query022(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) {
/* 8024B918-8024B954 246258 003C+00 1/0 0/0 0/0 .text
* query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
int dMsgFlow_c::query023(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) {
return (u16)(3 - dComIfGs_checkBombBag(NO_ITEM));
return (u16)(3 - dComIfGs_checkBombBag(fpcNm_ITEM_NONE));
}
/* 8024B954-8024B974 246294 0020+00 1/0 0/0 0/0 .text
@@ -1087,7 +1087,7 @@ int dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, in
u16 uVar2 = *(u16*)param_0->params;
u8 iVar4 = dComIfGs_getTmpReg(0xfbff);
u8 bombNum = dComIfGs_getBombNum(iVar4 - 1);
return dComIfGs_getBombMax(NORMAL_BOMB) >= bombNum + uVar2;
return dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB) >= bombNum + uVar2;
}
/* 8024BE4C-8024BF50 24678C 0104+00 1/0 0/0 0/0 .text
@@ -1125,7 +1125,7 @@ int dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, in
u16 uVar2 = *(u16*)param_0->params;
u8 iVar4 = dComIfGs_getTmpReg(0xfbff);
u8 bombNum = dComIfGs_getBombNum(iVar4 - 1);
return dComIfGs_getBombMax(WATER_BOMB) >= bombNum + uVar2;
return dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB) >= bombNum + uVar2;
}
/* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text
@@ -1152,7 +1152,7 @@ int dMsgFlow_c::query042(mesg_flow_node_branch*, fopAc_ac_c*, int) {
int dMsgFlow_c::query043(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) {
u16 prm0 = flow_node->params[0];
u8 bomb_num = dComIfGs_getBombNum(dComIfGs_getTmpReg(0xFBFF) - 1);
u8 bomb_max = dComIfGs_getBombMax(POKE_BOMB);
u8 bomb_max = dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB);
return bomb_max >= bomb_num + prm0;
}
@@ -1546,15 +1546,15 @@ int dMsgFlow_c::event017(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
if (prm1 <= 1) {
switch (prm0) {
case DROP_CONTAINER:
case fpcNm_ITEM_DROP_CONTAINER:
dMeter2Info_setLightDropGetFlag(0, 1);
dComIfGs_onLightDropGetFlag(0);
break;
case DROP_CONTAINER02:
case fpcNm_ITEM_DROP_CONTAINER02:
dMeter2Info_setLightDropGetFlag(1, 1);
dComIfGs_onLightDropGetFlag(1);
break;
case DROP_CONTAINER03:
case fpcNm_ITEM_DROP_CONTAINER03:
dMeter2Info_setLightDropGetFlag(2, 1);
dComIfGs_onLightDropGetFlag(2);
break;
@@ -1654,25 +1654,25 @@ int dMsgFlow_c::event023(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
switch (prm0) {
case 1:
dComIfGs_setEmptyBottleItemIn(RED_BOTTLE);
dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE);
break;
case 2:
dComIfGs_setEmptyBottleItemIn(GREEN_BOTTLE);
dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE);
break;
case 3:
dComIfGs_setEmptyBottleItemIn(BLUE_BOTTLE);
dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE);
break;
case 4:
dComIfGs_setEmptyBottleItemIn(MILK_BOTTLE);
dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_MILK_BOTTLE);
break;
case 5:
dComIfGs_setEmptyBottleItemIn(HALF_MILK_BOTTLE);
dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE);
break;
case 6:
dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE);
dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE);
break;
case 7:
dComIfGs_setEmptyBottleItemIn(HOT_SPRING);
dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING);
break;
}
@@ -1741,36 +1741,36 @@ int dMsgFlow_c::event027(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
switch (aParam8[1]) {
case 0:
if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) {
dComIfGs_setItem((u8)(SLOT_15 + slot), NORMAL_BOMB);
if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == fpcNm_ITEM_BOMB_BAG_LV1) {
dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_NORMAL_BOMB);
}
if (prm1 != 0) {
dComIfGp_setItemBombNumCount(slot, (u8)prm1);
} else {
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(NORMAL_BOMB));
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB));
}
break;
case 1:
if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) {
dComIfGs_setItem((u8)(SLOT_15 + slot), WATER_BOMB);
if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == fpcNm_ITEM_BOMB_BAG_LV1) {
dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_WATER_BOMB);
}
if (prm1 != 0) {
dComIfGp_setItemBombNumCount(slot, (u8)prm1);
} else {
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(WATER_BOMB));
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB));
}
break;
case 2:
if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) {
dComIfGs_setItem((u8)(SLOT_15 + slot), POKE_BOMB);
if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == fpcNm_ITEM_BOMB_BAG_LV1) {
dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_POKE_BOMB);
}
if (prm1 != 0) {
dComIfGp_setItemBombNumCount(slot, (u8)prm1);
} else {
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(POKE_BOMB));
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB));
}
break;
case 3:
@@ -1780,16 +1780,16 @@ int dMsgFlow_c::event027(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
dComIfGp_setItemBombNumCount(slot, (u8)prm1);
break;
case 6:
dComIfGs_setItem((u8)(SLOT_15 + slot), NORMAL_BOMB);
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(NORMAL_BOMB));
dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_NORMAL_BOMB);
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB));
break;
case 7:
dComIfGs_setItem((u8)(SLOT_15 + slot), WATER_BOMB);
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(WATER_BOMB));
dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_WATER_BOMB);
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB));
break;
case 8:
dComIfGs_setItem((u8)(SLOT_15 + slot), POKE_BOMB);
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(POKE_BOMB));
dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_POKE_BOMB);
dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB));
break;
case 9:
case 10:
@@ -1812,8 +1812,8 @@ int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) {
dComIfGp_setItemRupeeCount(bombPrice);
dComIfGs_setBombNum(bagID, 0);
if (dComIfGs_getItem((u8)(SLOT_15 + bagID), true) != BOMB_ARROW) {
dComIfGs_setItem((u8)(SLOT_15 + bagID), BOMB_BAG_LV1);
if (dComIfGs_getItem((u8)(SLOT_15 + bagID), true) != fpcNm_ITEM_BOMB_ARROW) {
dComIfGs_setItem((u8)(SLOT_15 + bagID), fpcNm_ITEM_BOMB_BAG_LV1);
} else {
for (int i = 0; i < 3; i++) {
u8 select_item = dComIfGs_getSelectItemIndex(i);
@@ -1821,12 +1821,12 @@ int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) {
if (SLOT_15 + bagID == select_item) {
u8 mix_item = dComIfGs_getMixItemIndex(i);
dComIfGs_setMixItemIndex(i, NO_ITEM);
dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE);
dComIfGs_setSelectItemIndex(i, mix_item);
dComIfGp_setSelectItem(i);
}
}
dComIfGs_setItem((u8)(SLOT_15 + bagID), BOMB_BAG_LV1);
dComIfGs_setItem((u8)(SLOT_15 + bagID), fpcNm_ITEM_BOMB_BAG_LV1);
}
return 1;
@@ -1930,12 +1930,12 @@ int dMsgFlow_c::event034(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
int dMsgFlow_c::event035(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
int prm0 = getParam(flow_node->params);
if (prm0 == TOMATO_PUREE || prm0 == TASTE) {
if (prm0 == fpcNm_ITEM_TOMATO_PUREE || prm0 == fpcNm_ITEM_TASTE) {
dComIfGs_offItemFirstBit(prm0);
} else if (prm0 == RAFRELS_MEMO || prm0 == ASHS_SCRIBBLING) {
dComIfGs_setItem(SLOT_19, NO_ITEM);
} else if (prm0 == LETTER || prm0 == BILL || prm0 == WOOD_STATUE || prm0 == IRIAS_PENDANT) {
dComIfGs_setWarashibeItem(NO_ITEM);
} else if (prm0 == fpcNm_ITEM_RAFRELS_MEMO || prm0 == fpcNm_ITEM_ASHS_SCRIBBLING) {
dComIfGs_setItem(SLOT_19, fpcNm_ITEM_NONE);
} else if (prm0 == fpcNm_ITEM_LETTER || prm0 == fpcNm_ITEM_BILL || prm0 == fpcNm_ITEM_WOOD_STATUE || prm0 == fpcNm_ITEM_IRIAS_PENDANT) {
dComIfGs_setWarashibeItem(fpcNm_ITEM_NONE);
}
return 1;
@@ -1986,25 +1986,25 @@ int dMsgFlow_c::event040(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
case 0:
break;
case 1:
dComIfGs_setBottleItemIn(RED_BOTTLE, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_RED_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE);
break;
case 2:
dComIfGs_setBottleItemIn(GREEN_BOTTLE, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE);
break;
case 3:
dComIfGs_setBottleItemIn(BLUE_BOTTLE, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE);
break;
case 4:
dComIfGs_setBottleItemIn(MILK_BOTTLE, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE);
break;
case 5:
dComIfGs_setBottleItemIn(HALF_MILK_BOTTLE, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE);
break;
case 6:
dComIfGs_setBottleItemIn(OIL_BOTTLE, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_OIL_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE);
break;
case 7:
dComIfGs_setBottleItemIn(HOT_SPRING, EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(fpcNm_ITEM_HOT_SPRING, fpcNm_ITEM_EMPTY_BOTTLE);
break;
}
src/d/d_msg_object.cpp
+1 -1
View File
@@ -2223,7 +2223,7 @@ void dMsgObject_c::setDemoMessageLocal(u32 param_1) {
u16 dMsgObject_c::getSmellTypeMessageIDLocal() {
u16 msgId = 0;
int smell = dComIfGs_getCollectSmell();
if (smell < SMELL_MEDICINE + 1 && smell >= SMELL_YELIA_POUCH) {
if (smell < fpcNm_ITEM_SMELL_MEDICINE + 1 && smell >= fpcNm_ITEM_SMELL_YELIA_POUCH) {
msgId = smell + 0x165;
} else {
if (dComIfGs_getCollectSmell() != -1) {
src/d/d_s_name.cpp
+7 -7
View File
@@ -251,13 +251,13 @@ void dScnName_c::brightCheck() {
field_0x41f = 0;
field_0x41d = 5;
dComIfGs_offItemFirstBit(GREEN_RUPEE);
dComIfGs_offItemFirstBit(BLUE_RUPEE);
dComIfGs_offItemFirstBit(YELLOW_RUPEE);
dComIfGs_offItemFirstBit(RED_RUPEE);
dComIfGs_offItemFirstBit(PURPLE_RUPEE);
dComIfGs_offItemFirstBit(ORANGE_RUPEE);
dComIfGs_offItemFirstBit(SILVER_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_GREEN_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_BLUE_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_RED_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE);
dComIfGs_offItemFirstBit(fpcNm_ITEM_SILVER_RUPEE);
}
}
src/d/d_s_play.cpp
+6 -6
View File
@@ -394,7 +394,7 @@ static int phase_1(dScnPly_c* i_this) {
dComIfGp_getStartStagePoint() == 3)
{
dComIfGs_onDarkClearLV(0);
execItemGet(WEAR_KOKIRI);
execItemGet(fpcNm_ITEM_WEAR_KOKIRI);
}
// Stage: Kakariko Village, Room: Kakariko Village
else if (!strcmp(dComIfGp_getStartStageName(), "F_SP109") &&
@@ -419,8 +419,8 @@ static int phase_1(dScnPly_c* i_this) {
if (!strcmp(dComIfGp_getStartStageName(), "F_SP104") && dComIfGp_getStartStageRoomNo() == 1 &&
dComIfGp_getStartStagePoint() == 23 && dComIfGp_getStartStageLayer() == 12)
{
dComIfGs_onItemFirstBit(HORSE_FLUTE);
dComIfGs_setItem(SLOT_21, HORSE_FLUTE);
dComIfGs_onItemFirstBit(fpcNm_ITEM_HORSE_FLUTE);
dComIfGs_setItem(SLOT_21, fpcNm_ITEM_HORSE_FLUTE);
}
if ((u8)dKy_darkworld_stage_check(dComIfGp_getStartStageName(),
@@ -616,9 +616,9 @@ static int phase_4(dScnPly_c* i_this) {
dComIfGs_init();
dComIfGs_setOptPointer(0);
dComIfGs_setLife(12);
dMeter2Info_setCloth(WEAR_KOKIRI, false);
dMeter2Info_setSword(SWORD, false);
dMeter2Info_setShield(HYLIA_SHIELD, false);
dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false);
dMeter2Info_setSword(fpcNm_ITEM_SWORD, false);
dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false);
dComIfGs_onEventBit(0x0601); // Epona Tamed
}
src/d/d_save.cpp
+92 -92
View File
@@ -13,12 +13,12 @@
/* 80032918-80032958 02D258 0040+00 4/4 0/0 0/0 .text dSv_item_rename__FUc */
static u8 dSv_item_rename(u8 i_itemNo) {
switch (i_itemNo) {
case OIL_BOTTLE_2:
return OIL_BOTTLE;
case RED_BOTTLE_2:
return RED_BOTTLE;
case OIL2:
return OIL;
case fpcNm_ITEM_OIL_BOTTLE_2:
return fpcNm_ITEM_OIL_BOTTLE;
case fpcNm_ITEM_RED_BOTTLE_2:
return fpcNm_ITEM_RED_BOTTLE;
case fpcNm_ITEM_OIL2:
return fpcNm_ITEM_OIL;
default:
return i_itemNo;
}
@@ -43,11 +43,11 @@ void dSv_player_status_a_c::init() {
mSelectEquip[i] = 0;
}
mSelectEquip[COLLECT_CLOTHING] = WEAR_CASUAL;
mSelectEquip[COLLECT_SWORD] = NO_ITEM;
mSelectEquip[COLLECT_SHIELD] = NO_ITEM;
mSelectEquip[COLLECT_SMELL] = NO_ITEM;
mSelectEquip[B_BUTTON_ITEM] = NO_ITEM;
mSelectEquip[COLLECT_CLOTHING] = fpcNm_ITEM_WEAR_CASUAL;
mSelectEquip[COLLECT_SWORD] = fpcNm_ITEM_NONE;
mSelectEquip[COLLECT_SHIELD] = fpcNm_ITEM_NONE;
mSelectEquip[COLLECT_SMELL] = fpcNm_ITEM_NONE;
mSelectEquip[B_BUTTON_ITEM] = fpcNm_ITEM_NONE;
mWalletSize = WALLET;
mMaxMagic = 0;
mMagic = 0;
@@ -257,8 +257,8 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz
/* 80032F90-80032FB8 02D8D0 0028+00 1/1 0/0 0/0 .text init__17dSv_player_item_cFv */
void dSv_player_item_c::init() {
for (int i = 0; i < MAX_ITEM_SLOTS; i++) {
mItems[i] = NO_ITEM;
mItemSlots[i] = NO_ITEM;
mItems[i] = fpcNm_ITEM_NONE;
mItemSlots[i] = fpcNm_ITEM_NONE;
}
}
@@ -284,59 +284,59 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const {
for (int i = 0; i < SELECT_ITEM_NUM; i++) {
if ((i_slotNo == dComIfGs_getSelectItemIndex(i) ||
i_slotNo == dComIfGs_getMixItemIndex(i)) &&
dComIfGs_getMixItemIndex(i) != NO_ITEM) {
dComIfGs_getMixItemIndex(i) != fpcNm_ITEM_NONE) {
u8 select_item = mItems[dComIfGs_getSelectItemIndex(i)];
u8 mix_item = mItems[dComIfGs_getMixItemIndex(i)];
// Get Bomb arrow check: Bow + Normal Bombs
if ((select_item == BOW && mix_item == NORMAL_BOMB) ||
(mix_item == BOW && select_item == NORMAL_BOMB)) {
return BOMB_ARROW;
if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_NORMAL_BOMB) ||
(mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_NORMAL_BOMB)) {
return fpcNm_ITEM_BOMB_ARROW;
}
// Get Bomb arrow check: Bow + Water Bombs
if ((select_item == BOW && mix_item == WATER_BOMB) ||
(mix_item == BOW && select_item == WATER_BOMB)) {
return BOMB_ARROW;
if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_WATER_BOMB) ||
(mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_WATER_BOMB)) {
return fpcNm_ITEM_BOMB_ARROW;
}
// Get Bomb arrow check: Bow + Bomblings
if ((select_item == BOW && mix_item == POKE_BOMB) ||
(mix_item == BOW && select_item == POKE_BOMB)) {
return BOMB_ARROW;
if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_POKE_BOMB) ||
(mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_POKE_BOMB)) {
return fpcNm_ITEM_BOMB_ARROW;
}
// Get Hawkeye check
if ((select_item == BOW && mix_item == HAWK_EYE) ||
(mix_item == BOW && select_item == HAWK_EYE)) {
return HAWK_ARROW;
if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_HAWK_EYE) ||
(mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_HAWK_EYE)) {
return fpcNm_ITEM_HAWK_ARROW;
}
// Get Rod w/ bee larva
if ((select_item == FISHING_ROD_1 && mix_item == BEE_CHILD) ||
(mix_item == FISHING_ROD_1 && select_item == BEE_CHILD)) {
return BEE_ROD;
if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_BEE_CHILD) ||
(mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_BEE_CHILD)) {
return fpcNm_ITEM_BEE_ROD;
}
// Get Rod w/ coral earring
if ((select_item == FISHING_ROD_1 && mix_item == ZORAS_JEWEL) ||
(mix_item == FISHING_ROD_1 && select_item == ZORAS_JEWEL)) {
return JEWEL_ROD;
if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_ZORAS_JEWEL) ||
(mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_ZORAS_JEWEL)) {
return fpcNm_ITEM_JEWEL_ROD;
}
// Get Rod w/ worm
if ((select_item == FISHING_ROD_1 && mix_item == WORM) ||
(mix_item == FISHING_ROD_1 && select_item == WORM)) {
return WORM_ROD;
if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_WORM) ||
(mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_WORM)) {
return fpcNm_ITEM_WORM_ROD;
}
// This block will only run on the Wii version
if (i == SELECT_ITEM_B) {
if (dComIfGs_getSelectItemIndex(i) == 0 &&
dComIfGs_getMixItemIndex(i) == 0) {
dComIfGs_setSelectItemIndex(i, NO_ITEM);
dComIfGs_setMixItemIndex(i, NO_ITEM);
return NO_ITEM;
dComIfGs_setSelectItemIndex(i, fpcNm_ITEM_NONE);
dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE);
return fpcNm_ITEM_NONE;
}
}
// Uncertain combination item＝＝＝＞%d, %d\n
@@ -347,7 +347,7 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const {
return mItems[i_slotNo];
}
return NO_ITEM;
return fpcNm_ITEM_NONE;
}
/* 800332F8-80033354 02DC38 005C+00 2/2 0/0 0/0 .text setLineUpItem__17dSv_player_item_cFv */
@@ -360,12 +360,12 @@ void dSv_player_item_c::setLineUpItem() {
int slot_idx = 0;
for (int i = 0; i < 24; i++) {
mItemSlots[i] = NO_ITEM;
mItemSlots[i] = fpcNm_ITEM_NONE;
}
for (int i = 0; i < 23; i++) {
u32 current = i_item_lst[i];
if (mItems[current] != NO_ITEM) {
if (mItems[current] != fpcNm_ITEM_NONE) {
mItemSlots[slot_idx] = current;
slot_idx++;
}
@@ -378,7 +378,7 @@ u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const {
return mItemSlots[i_slotNo];
}
return NO_ITEM;
return fpcNm_ITEM_NONE;
}
/* 80033370-80033450 02DCB0 00E0+00 1/1 2/2 0/0 .text setBottleItemIn__17dSv_player_item_cFUcUc */
@@ -389,7 +389,7 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) {
for (int i = 0; i < 4; i++) {
if (curItemIn == mItems[i + SLOT_11]) {
setItem(i + SLOT_11, newItemIn);
if (newItemIn == HOT_SPRING) {
if (newItemIn == fpcNm_ITEM_HOT_SPRING) {
dMeter2Info_setHotSpringTimer(i + SLOT_11);
}
@@ -407,14 +407,14 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) {
* setEmptyBottleItemIn__17dSv_player_item_cFUc */
void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) {
i_itemNo = dSv_item_rename(i_itemNo);
setBottleItemIn(EMPTY_BOTTLE, i_itemNo);
setBottleItemIn(fpcNm_ITEM_EMPTY_BOTTLE, i_itemNo);
}
/* 80033494-80033514 02DDD4 0080+00 0/0 1/1 1/1 .text setEmptyBottle__17dSv_player_item_cFv */
void dSv_player_item_c::setEmptyBottle() {
for (int i = 0; i < 4; i++) {
if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) {
dComIfGs_setItem((u8)(i + SLOT_11), EMPTY_BOTTLE);
if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) {
dComIfGs_setItem((u8)(i + SLOT_11), fpcNm_ITEM_EMPTY_BOTTLE);
return;
}
}
@@ -423,7 +423,7 @@ void dSv_player_item_c::setEmptyBottle() {
/* 80033514-80033598 02DE54 0084+00 0/0 3/3 0/0 .text setEmptyBottle__17dSv_player_item_cFUc */
void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) {
for (int i = 0; i < 4; i++) {
if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) {
if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) {
dComIfGs_setItem((u8)(i + SLOT_11), i_itemNo);
return;
}
@@ -437,7 +437,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) {
if (dComIfGs_getSelectItemIndex(curItemIn) >= SLOT_11 &&
dComIfGs_getSelectItemIndex(curItemIn) <= SLOT_14) {
if (newItemIn == HOT_SPRING) {
if (newItemIn == fpcNm_ITEM_HOT_SPRING) {
dMeter2Info_setHotSpringTimer(dComIfGs_getSelectItemIndex(curItemIn));
}
@@ -451,7 +451,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) {
/* 800336BC-800336E0 02DFFC 0024+00 0/0 4/4 0/0 .text
* setEquipBottleItemEmpty__17dSv_player_item_cFUc */
void dSv_player_item_c::setEquipBottleItemEmpty(u8 curItemIn) {
setEquipBottleItemIn(curItemIn, EMPTY_BOTTLE);
setEquipBottleItemIn(curItemIn, fpcNm_ITEM_EMPTY_BOTTLE);
}
/* 800336E0-80033754 02E020 0074+00 0/0 30/30 0/0 .text checkBottle__17dSv_player_item_cFUc */
@@ -547,7 +547,7 @@ u16 dSv_event_flag_c::saveBitLabels[822] = {
/* 80033754-800337EC 02E094 0098+00 0/0 1/1 0/0 .text checkInsectBottle__17dSv_player_item_cFv */
BOOL dSv_player_item_c::checkInsectBottle() {
for (int i = 0; i < 24; i++) {
if (dComIfGs_isItemFirstBit(M_BEETLE + i) &&
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE + i) &&
!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) {
return TRUE;
}
@@ -560,7 +560,7 @@ u8 dSv_player_item_c::checkEmptyBottle() {
u8 bottleNum = 0;
for (int i = 0; i < BOTTLE_MAX; i++) {
if (mItems[i + SLOT_11] == EMPTY_BOTTLE) {
if (mItems[i + SLOT_11] == fpcNm_ITEM_EMPTY_BOTTLE) {
bottleNum++;
}
}
@@ -574,7 +574,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setN
if (i_curBomb == mItems[i + SLOT_15]) {
setItem(i + SLOT_15, i_newBomb);
if (i_setNum == true && i_newBomb != BOMB_BAG_LV1) {
if (i_setNum == true && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) {
dComIfGs_setBombNum(i, dComIfGs_getBombMax(i_newBomb));
}
@@ -595,7 +595,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu
if (i_curBomb == mItems[i + SLOT_15]) {
setItem(i + SLOT_15, i_newBomb);
if (i_setNum == 1 && i_newBomb != BOMB_BAG_LV1) {
if (i_setNum == 1 && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) {
if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) {
i_bombNum = dComIfGs_getBombMax(i_newBomb);
}
@@ -615,20 +615,20 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu
/* 80033A20-80033A50 02E360 0030+00 0/0 2/2 0/0 .text
* setEmptyBombBagItemIn__17dSv_player_item_cFUcb */
void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) {
setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_setNum);
setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_setNum);
}
/* 80033A50-80033A88 02E390 0038+00 0/0 1/1 1/1 .text
* setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb */
void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) {
setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum);
setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum);
}
/* 80033A88-80033B08 02E3C8 0080+00 0/0 2/2 0/0 .text setEmptyBombBag__17dSv_player_item_cFv */
void dSv_player_item_c::setEmptyBombBag() {
for (int i = 0; i < 3; i++) {
if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) {
dComIfGs_setItem((u8)(i + SLOT_15), BOMB_BAG_LV1);
if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) {
dComIfGs_setItem((u8)(i + SLOT_15), fpcNm_ITEM_BOMB_BAG_LV1);
return;
}
}
@@ -637,10 +637,10 @@ void dSv_player_item_c::setEmptyBombBag() {
/* 80033B08-80033BEC 02E448 00E4+00 0/0 3/3 0/0 .text setEmptyBombBag__17dSv_player_item_cFUcUc */
void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) {
for (int i = 0; i < 3; i++) {
if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) {
if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) {
dComIfGs_setItem((u8)(i + SLOT_15), i_newBomb);
if (i_newBomb == BOMB_BAG_LV1) {
if (i_newBomb == fpcNm_ITEM_BOMB_BAG_LV1) {
return;
}
@@ -681,16 +681,16 @@ void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) {
/* 80033CBC-80033D40 02E5FC 0084+00 0/0 1/1 0/0 .text setRodTypeLevelUp__17dSv_player_item_cFv */
void dSv_player_item_c::setRodTypeLevelUp() {
switch (mItems[SLOT_20]) {
case BEE_ROD: {
mItems[SLOT_20] = JEWEL_BEE_ROD;
case fpcNm_ITEM_BEE_ROD: {
mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD;
break;
}
case WORM_ROD: {
mItems[SLOT_20] = JEWEL_WORM_ROD;
case fpcNm_ITEM_WORM_ROD: {
mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD;
break;
}
case FISHING_ROD_1: {
mItems[SLOT_20] = JEWEL_ROD;
case fpcNm_ITEM_FISHING_ROD_1: {
mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD;
break;
}
}
@@ -704,19 +704,19 @@ void dSv_player_item_c::setRodTypeLevelUp() {
*/
void dSv_player_item_c::setBaitItem(u8 i_itemNo) {
switch (i_itemNo) {
case BEE_CHILD: {
dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_BEE_ROD :
mItems[SLOT_20] = BEE_ROD;
case fpcNm_ITEM_BEE_CHILD: {
dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL) ? mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD :
mItems[SLOT_20] = fpcNm_ITEM_BEE_ROD;
break;
}
case WORM: {
dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_WORM_ROD :
mItems[SLOT_20] = WORM_ROD;
case fpcNm_ITEM_WORM: {
dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL) ? mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD :
mItems[SLOT_20] = fpcNm_ITEM_WORM_ROD;
break;
}
case NO_ITEM: {
dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_ROD :
mItems[SLOT_20] = FISHING_ROD_1;
case fpcNm_ITEM_NONE: {
dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL) ? mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD :
mItems[SLOT_20] = fpcNm_ITEM_FISHING_ROD_1;
break;
}
}
@@ -815,22 +815,22 @@ void dSv_player_item_max_c::init() {
for (int i = 0; i < 7; i++) {
mItemMax[i] = 30;
}
setBombNum(NORMAL_BOMB, 30);
setBombNum(WATER_BOMB, 15);
setBombNum(POKE_BOMB, 10);
setBombNum(fpcNm_ITEM_NORMAL_BOMB, 30);
setBombNum(fpcNm_ITEM_WATER_BOMB, 15);
setBombNum(fpcNm_ITEM_POKE_BOMB, 10);
mItemMax[7] = 0;
}
/* 800340B8-800340F8 02E9F8 0040+00 1/1 0/0 0/0 .text setBombNum__21dSv_player_item_max_cFUcUc */
void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) {
switch (i_bombType) {
case NORMAL_BOMB:
case fpcNm_ITEM_NORMAL_BOMB:
mItemMax[NORMAL_BOMB_MAX] = i_maxNum;
return;
case WATER_BOMB:
case fpcNm_ITEM_WATER_BOMB:
mItemMax[WATER_BOMB_MAX] = i_maxNum;
return;
case POKE_BOMB:
case fpcNm_ITEM_POKE_BOMB:
mItemMax[POKE_BOMB_MAX] = i_maxNum;
return;
}
@@ -839,16 +839,16 @@ void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) {
/* 800340F8-800341AC 02EA38 00B4+00 3/3 14/14 2/2 .text getBombNum__21dSv_player_item_max_cCFUc */
u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const {
u8 lv_multiplier = 1;
if (dComIfGs_isItemFirstBit(BOMB_BAG_LV2)) {
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2)) {
lv_multiplier = 2;
}
switch (i_bombType) {
case NORMAL_BOMB:
case fpcNm_ITEM_NORMAL_BOMB:
return (u8)(mItemMax[NORMAL_BOMB_MAX] * lv_multiplier);
case WATER_BOMB:
case fpcNm_ITEM_WATER_BOMB:
return (u8)(mItemMax[WATER_BOMB_MAX] * lv_multiplier);
case POKE_BOMB:
case fpcNm_ITEM_POKE_BOMB:
return (u8)(mItemMax[POKE_BOMB_MAX] * lv_multiplier);
default:
return 0;
@@ -1677,9 +1677,9 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
}
// If have the lantern and Slot 1 in the item wheel is blank
if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, 1) == NO_ITEM) {
if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, 1) == fpcNm_ITEM_NONE) {
// Set Slot 1 to Lantern and fetch current oil
dComIfGs_setItem(SLOT_1, KANTERA);
dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA);
current_lantern_oil = dComIfGs_getOil();
// Set oil to oil gauge backup
@@ -1719,7 +1719,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
// Now that we've saved, reset slot if needed
if (tmp_lantern_check == true) {
dComIfGs_setItem(SLOT_1, NO_ITEM);
dComIfGs_setItem(SLOT_1, fpcNm_ITEM_NONE);
dComIfGs_setOil(current_lantern_oil);
}
@@ -1749,13 +1749,13 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) {
dComIfGs_setKeyNum(6, 0);
if (dComIfGs_getItem(SLOT_9, true) == W_HOOKSHOT) {
dComIfGs_setItem(SLOT_10, W_HOOKSHOT);
dComIfGs_setItem(SLOT_9, NO_ITEM);
if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_W_HOOKSHOT) {
dComIfGs_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT);
dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE);
}
if (dComIfGs_getItem(SLOT_9, true) == HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT) {
dComIfGs_setItem(SLOT_9, NO_ITEM);
if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == fpcNm_ITEM_W_HOOKSHOT) {
dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE);
}
dComIfGs_setLineUpItem();
src/d/d_shop_system.cpp
+21 -21
View File
@@ -28,7 +28,7 @@ static daTag_ShopItem_c* dShopSystem_itemActor[7] = {
/* 804506E8-804506F0 000168 0007+01 7/7 0/0 0/0 .sdata dShopSystem_itemNo */
static u8 dShopSystem_itemNo[7] = {
NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM,
fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE,
};
/* 80451058-8045105C 000558 0004+00 9/9 0/0 0/0 .sbss None */
@@ -62,7 +62,7 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) {
if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) &&
(sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2)))
{
if (sw != 0xFF && item_no == HYLIA_SHIELD && checkItemGet(item_no, true)) {
if (sw != 0xFF && item_no == fpcNm_ITEM_HYLIA_SHIELD && checkItemGet(item_no, true)) {
dComIfGs_onSaveSwitch(sw);
} else {
if (i_posID == 0) {
@@ -126,7 +126,7 @@ void dShopSystem_c::initShopSystem() {
for (int i = 0; i < 7; i++) {
dShopSystem_itemActor[i] = NULL;
dShopSystem_itemNo[i] = NO_ITEM;
dShopSystem_itemNo[i] = fpcNm_ITEM_NONE;
}
dShopSystem_item_count = 0;
@@ -196,7 +196,7 @@ dShopSystem_c::~dShopSystem_c() {
for (int i = 0; i < 7; i++) {
dShopSystem_itemActor[i] = NULL;
dShopSystem_itemNo[i] = NO_ITEM;
dShopSystem_itemNo[i] = fpcNm_ITEM_NONE;
}
dShopSystem_item_count = 0;
@@ -721,7 +721,7 @@ int dShopSystem_c::itemRotate() {
u8 cursor_pos = mCursorPos;
if (cursor_pos != 0 && mSeq != SEQ_WAIT) {
if (dShopSystem_itemNo[cursor_pos - 1] == ARMOR) {
if (dShopSystem_itemNo[cursor_pos - 1] == fpcNm_ITEM_ARMOR) {
int tmp_index;
if (isFlag(8) == false) {
tmp_index = 0;
@@ -756,7 +756,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) {
if (field_0xf60 >= 0) {
local_1c.set(*param_0);
if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) {
if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) {
mItemCtrl.setZoomAnime(mCursorPos, &local_1c,
g_cursorHIO.mSeraShopObjZoomAngleX + -5000,
isFlag(8) ? true : false);
@@ -807,9 +807,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) {
g_cursorHIO.mObjZoom.z + 150.0f);
} else {
if (field_0xf77 == 5) {
if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 ||
dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 ||
dShopSystem_itemNo[mCursorPos - 1] == ARROW_30)
if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 ||
dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 ||
dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30)
{
local_34.set(g_cursorHIO.mObjZoom.x, -50.0f + g_cursorHIO.mObjZoom.y + 5.0f,
(g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f);
@@ -840,7 +840,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) {
u8 dvar1 = field_0xf77;
if (dvar1 == 1) {
if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) {
if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) {
mItemCtrl.setZoomAnime(mCursorPos, &local_1c,
g_cursorHIO.mShopObjZoomAngleX + -7000,
isFlag(8) ? true : false);
@@ -849,7 +849,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) {
isFlag(8) ? true : false);
}
} else if (dvar1 == 2) {
if (dShopSystem_itemNo[mCursorPos - 1] == RED_BOTTLE) {
if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_RED_BOTTLE) {
mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000,
isFlag(8) ? true : false);
} else {
@@ -857,9 +857,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) {
isFlag(8) ? true : false);
}
} else if (dvar1 == 5) {
if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 ||
dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 ||
dShopSystem_itemNo[mCursorPos - 1] == ARROW_30)
if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 ||
dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 ||
dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30)
{
mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 4000,
isFlag(8) ? true : false);
@@ -1359,7 +1359,7 @@ static shop_item_data* shop_item_pos_data_tbl = &item_seira_shop;
*/
void dShopSystem_c::createShopItem(int itemType) {
static const u8 item_no[6] = {
MILK_BOTTLE, BEE_CHILD, PACHINKO, MILK_BOTTLE, BEE_CHILD, NO_ITEM,
fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_PACHINKO, fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_NONE,
};
if (itemType != -1) {
@@ -1374,7 +1374,7 @@ void dShopSystem_c::createShopItem(int itemType) {
pos.y = shop_item_pos_data_tbl->mItemPos[i].y + current.pos.y;
pos.z = shop_item_pos_data_tbl->mItemPos[i].z + current.pos.z;
if (itemTbl[i] != NO_ITEM) {
if (itemTbl[i] != fpcNm_ITEM_NONE) {
u32 index = fopAcM_create(PROC_ShopItem, itemTbl[i], &pos, fopAcM_GetRoomNo(this),
&current.angle, NULL, -1);
mItemCtrl.setItemIndex(i, index);
@@ -1418,19 +1418,19 @@ void dShopSystem_c::setSoldOut() {
return;
} else if (index == 0) {
dShopSystem_itemActor[0] = NULL;
dShopSystem_itemNo[0] = NO_ITEM;
dShopSystem_itemNo[0] = fpcNm_ITEM_NONE;
dShopSystem_item_count = 2;
} else if (index == 1) {
dShopSystem_itemActor[1] = NULL;
dShopSystem_itemNo[1] = NO_ITEM;
dShopSystem_itemNo[1] = fpcNm_ITEM_NONE;
dShopSystem_item_count = 2;
} else if (index == 2) {
dShopSystem_itemActor[2] = NULL;
dShopSystem_itemNo[2] = NO_ITEM;
dShopSystem_itemNo[2] = fpcNm_ITEM_NONE;
dShopSystem_item_count = 2;
} else if (index == 6) {
dShopSystem_itemActor[6] = NULL;
dShopSystem_itemNo[6] = NO_ITEM;
dShopSystem_itemNo[6] = fpcNm_ITEM_NONE;
dShopSystem_item_count = 6;
}
@@ -1660,4 +1660,4 @@ bool dShopSystem_c::dpdMove() {
return false;
}
#pragma nosyminline on
#pragma nosyminline on
src/f_op/f_op_actor_mng.cpp
+28 -28
View File
@@ -1135,7 +1135,7 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 p
cXyz const* i_scale) {
dComIfGp_event_setGtItm(i_itemNo);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == fpcNm_ITEM_NONE) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -1148,7 +1148,7 @@ fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_
int i_roomNo, csXyz const* i_angle, cXyz const* i_scale) {
dComIfGp_event_setGtItm(i_itemNo);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == fpcNm_ITEM_NONE) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -1276,7 +1276,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_it
#endif
int itemNo = fopAcM_getItemNoFromTableNo(i_tableNo);
if (itemNo == NO_ITEM) {
if (itemNo == fpcNm_ITEM_NONE) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -1304,7 +1304,7 @@ fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitN
JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255);
// clang-format on
if (i_itemNo == NO_ITEM) {
if (i_itemNo == fpcNm_ITEM_NONE) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -1364,7 +1364,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i
JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255);
// clang-format on
if (i_itemNo == NO_ITEM) {
if (i_itemNo == fpcNm_ITEM_NONE) {
return fpcM_ERROR_PROCESS_ID_e;
}
@@ -1380,29 +1380,29 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i
u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, 0xFF, param_7);
switch (i_itemNo) {
case RECOVERY_FAILY:
case fpcNm_ITEM_RECOVERY_FAILY:
return fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1);
#ifdef DEBUG
case SMALL_KEY:
case fpcNm_ITEM_SMALL_KEY:
// "Small Key: Can't support map display, so program generation is prohibited!\n"
OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
case KANTERA:
case fpcNm_ITEM_KANTERA:
// "Lantern: Program generation is prohibited!\n"
OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
case LIGHT_DROP:
case fpcNm_ITEM_LIGHT_DROP:
// "Light Drop: Program generation is prohibited!\n"
OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
#endif
case KAKERA_HEART:
case UTAWA_HEART:
case fpcNm_ITEM_KAKERA_HEART:
case fpcNm_ITEM_UTAWA_HEART:
return fopAcM_create(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1);
case TRIPLE_HEART:
case fpcNm_ITEM_TRIPLE_HEART:
for (int i = 0; i < 2; i++) {
fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1);
item_angle.y = cM_rndFX(0x7FFF);
@@ -1422,7 +1422,7 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi
csXyz item_angle(csXyz::Zero);
if (i_itemNo == NO_ITEM) {
if (i_itemNo == fpcNm_ITEM_NONE) {
return NULL;
}
@@ -1437,31 +1437,31 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi
u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, 0xFF, param_5);
switch (i_itemNo) {
case RECOVERY_FAILY:
case fpcNm_ITEM_RECOVERY_FAILY:
return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1,
NULL, NULL);
#ifdef DEBUG
case SMALL_KEY:
case fpcNm_ITEM_SMALL_KEY:
// "Small Key: Can't support map display, so program generation is prohibited!\n"
OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
case KANTERA:
case fpcNm_ITEM_KANTERA:
// "Lantern: Program generation is prohibited!\n"
OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
case LIGHT_DROP:
case fpcNm_ITEM_LIGHT_DROP:
// "Light Drop: Program generation is prohibited!\n"
OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
#endif
case KAKERA_HEART:
case UTAWA_HEART:
case fpcNm_ITEM_KAKERA_HEART:
case fpcNm_ITEM_UTAWA_HEART:
return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale,
-1, NULL, NULL);
case TRIPLE_HEART:
case fpcNm_ITEM_TRIPLE_HEART:
for (int i = 0; i < 2; i++) {
fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL,
NULL);
@@ -1482,7 +1482,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo,
JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256);
csXyz angle;
if (i_itemNo == NO_ITEM) {
if (i_itemNo == fpcNm_ITEM_NONE) {
return NULL;
}
@@ -1497,31 +1497,31 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo,
}
switch (i_itemNo) {
case RECOVERY_FAILY:
case fpcNm_ITEM_RECOVERY_FAILY:
return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1,
NULL, NULL);
#ifdef DEBUG
case SMALL_KEY:
case fpcNm_ITEM_SMALL_KEY:
// "Small Key: Can't support map display, so program generation is prohibited!\n"
OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
case KANTERA:
case fpcNm_ITEM_KANTERA:
// "Lantern: Program generation is prohibited!\n"
OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
case LIGHT_DROP:
case fpcNm_ITEM_LIGHT_DROP:
// "Light Drop: Program generation is prohibited!\n"
OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n");
JUT_ASSERT(0);
break;
#endif
case KAKERA_HEART:
case UTAWA_HEART:
case fpcNm_ITEM_KAKERA_HEART:
case fpcNm_ITEM_UTAWA_HEART:
return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale,
-1, NULL, NULL);
case TRIPLE_HEART:
case fpcNm_ITEM_TRIPLE_HEART:
for (i = 0; i < 2; i++) {
if (i_angle != NULL) {
angle = *i_angle;