Skip to content

Commit

Permalink
Rename VB flag
Browse files Browse the repository at this point in the history
  • Loading branch information
JordanLongstaff committed Dec 15, 2024
1 parent 5e4de2b commit 83bcc55
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/game-interactor/GameInteractor.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ typedef enum {
*/
VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW,
// Opt: *EnGo2
VB_GORON_LINK_NOT_BE_SCARED,
VB_GORON_LINK_BE_SCARED,
// Vanilla condition: CUR_CAPACITY(UPG_BOMB_BAG) >= 20 && this->waypoint > 7 && this->waypoint < 12
VB_BE_ELIGIBLE_FOR_CHILD_ROLLING_GORON_REWARD,
// Vanilla condition: !CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON)
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/timesaver_hook_handlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
}
break;
}
case VB_GORON_LINK_NOT_BE_SCARED: {
case VB_GORON_LINK_BE_SCARED: {
if (ForcedDialogIsDisabled(FORCED_DIALOG_SKIP_NPC)) {
EnGo2* goronLink = va_arg(args, EnGo2*);
goronLink->trackingMode = NPC_TRACKING_NONE;
Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@ void EnGo2_GroundRolling(EnGo2* this, PlayState* play) {
if (this->unk_59C == 0) {
switch (this->actor.params & 0x1F) {
case GORON_CITY_LINK:
if (GameInteractor_Should(VB_GORON_LINK_NOT_BE_SCARED, true, this)) {
if (GameInteractor_Should(VB_GORON_LINK_BE_SCARED, true, this)) {
this->goronState = 0;
this->actionFunc = EnGo2_GoronLinkStopRolling;
}
Expand Down

0 comments on commit 83bcc55

Please sign in to comment.