From 362cc11c5889bdd2742a19969ea7bef00e31ec52 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 6 Oct 2023 02:23:10 -0400 Subject: [PATCH] Fix version difference --- src/d/actor/d_a_am.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index b3b7baff3..e5f20cc46 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -212,6 +212,12 @@ static void anm_init(am_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f3 static void body_atari_check(am_class* i_this) { daPy_py_c* player = daPy_getPlayerActorClass(); +#if VERSION == VERSION_JPN + if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) { + return; + } +#endif + i_this->mStts.Move(); if (i_this->mBodyCyl.ChkTgHit() || i_this->mNeedleCyl.ChkTgHit()) { @@ -246,9 +252,11 @@ static void body_atari_check(am_class* i_this) { break; case AT_TYPE_SKULL_HAMMER: fopAcM_seStart(i_this, JA_SE_LK_HAMMER_HIT, 0x42); +#if VERSION != VERSION_JPN if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) { return; } +#endif if (i_this->mAction == ACTION_HANDOU_MOVE) { return; }