mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 06:16:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix version difference

Browse Source
This commit is contained in:
LagoLunatic
2023-10-06 02:23:10 -04:00
parent 5ee08bbc2b
commit 362cc11c58
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_am.cpp
+8
View File
@@ -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;
}