diff --git a/configure.py b/configure.py index 9b3ef8e93c8..58e80b5dbb9 100755 --- a/configure.py +++ b/configure.py @@ -2273,7 +2273,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_obj_zraMark"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_zra_freeze"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_zra_rock"), - ActorRel(NonMatching, "d_a_passer_mng"), + ActorRel(MatchingFor(ALL_GCN), "d_a_passer_mng"), ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_arena"), ActorRel(MatchingFor(ALL_GCN), "d_a_peru"), ActorRel(MatchingFor(ALL_GCN), "d_a_ppolamp"), diff --git a/include/d/actor/d_a_passer_mng.h b/include/d/actor/d_a_passer_mng.h index c48a5723848..778530d336c 100644 --- a/include/d/actor/d_a_passer_mng.h +++ b/include/d/actor/d_a_passer_mng.h @@ -2,6 +2,7 @@ #define D_A_PASSER_MNG_H #include "SSystem/SComponent/c_lib.h" +#include "d/d_kankyo.h" #include "f_op/f_op_actor_mng.h" class dPath; @@ -28,7 +29,7 @@ public: u8 getIntervalTime() { return fopAcM_GetParam(this) >> 24; } int getStartTime() { return (fopAcM_GetParam(this) >> 8) & 0xff; } u8 getEndTime() { return (fopAcM_GetParam(this) >> 16) & 0xff; } - u8 getMaxNum() { return shape_angle.x; } + u8 getMaxNum() { return shape_angle.x & 0xFF; } u8 getGroupNo() { return (shape_angle.x >> 8) & 0xff; } int getTimeHour() { diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index dd3e566c393..e1b222e2935 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -16,7 +16,6 @@ static int daPasserMng_Execute(daPasserMng_c* i_this) { } /* 80D45738-80D4597C 000098 0244+00 1/1 0/0 0/0 .text execute__13daPasserMng_cFv */ -// NONMATCHING - getTime regalloc int daPasserMng_c::execute() { int time = getTime(); if ((field_0x596 != 0 || (time >= startTime && time < endTime)) &&