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 8718d28cc3
commit e7b0ad79e0
100 changed files with 4161 additions and 3958 deletions
+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());
}