github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Simplify a bit"

Browse source 
This reverts commit ffa68c130fede6962bb4488b85c9ec61ccc60170.
This commit is contained in:
JordanLongstaff 2025-04-03 23:06:28 -04:00
commit 6ce809a972
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View file

@ -725,6 +725,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) { if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO)) {
EnHeishi2* enHeishi2 = va_arg(args, EnHeishi2*); EnHeishi2* enHeishi2 = va_arg(args, EnHeishi2*);
enHeishi2->unk_2F2[0] = 0; enHeishi2->unk_2F2[0] = 0;
if (enHeishi2->cameraId != MAIN_CAM) {
Play_ClearCamera(gPlayState, enHeishi2->cameraId);
Play_ChangeCameraStatus(gPlayState, MAIN_CAM, CAM_STAT_ACTIVE);
}
*should = false; *should = false;
} }
break; break;

6
soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View file

@ -510,8 +510,10 @@ void func_80A53F30(EnHeishi2* this, PlayState* play) {
} }
gate = (BgGateShutter*)this->gate; gate = (BgGateShutter*)this->gate;
if ((this->unk_2F2[0] == 0) || (gate->openingState == 0)) { if ((this->unk_2F2[0] == 0) || (gate->openingState == 0)) {
Play_ClearCamera(play, this->cameraId); if (GameInteractor_Should(VB_PLAY_KAKARIKO_GATE_CS, true, this)) {
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE); Play_ClearCamera(play, this->cameraId);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
}
if ((this->unk_30A != 2)) { if ((this->unk_30A != 2)) {
if (this->unk_30A == 0) { if (this->unk_30A == 0) {
this->actor.textId = 0x2015; this->actor.textId = 0x2015;