diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-12-10 08:46:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-10 18:46:19 +0200 |
| commit | 8d73439554beb2b4870b86159aa2e676357792b7 (patch) | |
| tree | f146d56805cdbbf0ee01412b66d328396d2b0305 /src/d/actor/d_a_obj_master_sword.cpp | |
| parent | 3fa6b50e6ab76f8d6fed3c92a70084db2f0e221e (diff) | |
tbox/camera/d_bg_w_kcol work and cleanup (#2262)
* some camera/tbox cleanup
* d_bg_w_kcol work
* make item name enum better
Diffstat (limited to 'src/d/actor/d_a_obj_master_sword.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_master_sword.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 81b859b6c1..421d1aab35 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -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()]); |