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

* 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
+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
}