diff --git a/configure.py b/configure.py index 9aca39879..79677964f 100755 --- a/configure.py +++ b/configure.py @@ -1363,7 +1363,7 @@ config.libs = [ ActorRel(Matching, "d_a_kytag04"), ActorRel(Matching, "d_a_kytag05"), ActorRel(Matching, "d_a_kytag06"), - ActorRel(NonMatching, "d_a_kytag07"), + ActorRel(Matching, "d_a_kytag07"), ActorRel(Matching, "d_a_lamp" , extra_cflags=['-sym off']), ActorRel(NonMatching, "d_a_lod_bg"), ActorRel(Matching, "d_a_lwood"), diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 6281e0fe2..b48e54d00 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -14,7 +14,6 @@ static BOOL daKytag07_Draw(kytag07_class*) { /* 00000080-000002A8 .text daKytag07_Execute__FP13kytag07_class */ static BOOL daKytag07_Execute(kytag07_class* i_this) { - /* Nonmatching */ dScnKy_env_light_c& envLight = dKy_getEnvlight(); if (strcmp(dComIfGp_getStartStageName(), "GTower") != 0) { f32 time = dComIfGs_getTime(); @@ -26,7 +25,7 @@ static BOOL daKytag07_Execute(kytag07_class* i_this) { } else { u8 mode = fopAcM_GetParam(i_this) & 0xFF; if (mode != 1) { - if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck("g2before") && dComIfGp_demo_get() != NULL && dComIfGp_demo_get()->getFrameNoMsg() >= 4719) { + if (dComIfGp_event_runCheck() != FALSE && dComIfGp_evmng_startCheck("g2before") && dComIfGp_demo_get() != NULL && dComIfGp_demo_get()->getFrameNoMsg() >= 4719) { if (dComIfGp_demo_get()->getFrameNoMsg() == 4719) dKy_change_colpat(1); if (envLight.mRainCount < 250) @@ -39,7 +38,7 @@ static BOOL daKytag07_Execute(kytag07_class* i_this) { dKy_getEnvlight().mThunderEff.mMode = 2; } } else { - if (dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck() != FALSE) { dDemo_manager_c* demo = dComIfGp_demo_get(); dKy_getEnvlight().mMoyaMode = 0; if (demo != NULL) {