mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-01 00:13:05 -04:00
Merge pull request #2259 from baxlek/transform-anywhere-fix
Can Transform Anywhere fix
This commit is contained in:
@@ -3300,7 +3300,7 @@ int daMidna_c::execute() {
|
||||
if (!checkStateFlg0(FLG0_UNK_8000)) {
|
||||
offStateFlg0((daMidna_FLG0)(FLG0_NPC_NEAR | FLG0_NPC_FAR));
|
||||
BOOL far_;
|
||||
if (fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &far_)) {
|
||||
if (fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &far_) IF_DUSK(&& !dusk::getSettings().game.canTransformAnywhere)) {
|
||||
if (!far_) {
|
||||
onStateFlg0(FLG0_NPC_NEAR);
|
||||
} else {
|
||||
|
||||
@@ -1762,7 +1762,7 @@ u16 dMsgFlow_c::query042(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
|
||||
daMidna_c* midna_p = daPy_py_c::getMidnaActor();
|
||||
|
||||
u8 ret = 0;
|
||||
if (strcmp("F_SP116", dComIfGp_getStartStageName()) == 0 && dComIfGs_isSaveDunSwitch(60)) {
|
||||
if (strcmp("F_SP116", dComIfGp_getStartStageName()) == 0 && dComIfGs_isSaveDunSwitch(60) IF_DUSK(&& !dusk::getSettings().game.canTransformAnywhere)) {
|
||||
ret = 4;
|
||||
} else if (midna_p->checkNpcNear()) {
|
||||
ret = 1;
|
||||
|
||||
Reference in New Issue
Block a user