mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

ac_npc_shasho: use act enum, ac_npc_majin2: use think enum

Browse Source
This commit is contained in:
Cuyler36
2025-06-11 19:15:35 -04:00
parent 46ab65200d
commit eadece995d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actor/npc/ac_npc_majin2_talk.c_inc
+3 -3
View File
@@ -38,7 +38,7 @@ static void aMJN2_set_force_talk_info(ACTOR* actorx) {
}
mPlib_Set_able_hand_all_item_in_demo(TRUE);
mBGMPsComp_make_ps_quietField(0);
actor->next_think_idx = 3;
actor->next_think_idx = aMJN2_THINK_WAIT;
}
static void aMJN2_force_talk_request(ACTOR* actorx, GAME* game) {
@@ -57,7 +57,7 @@ static void aMJN2_set_norm_talk_info(ACTOR* actorx) {
actor->talk_proc = data_p->talk_proc;
mPlib_Set_able_hand_all_item_in_demo(TRUE);
mBGMPsComp_make_ps_quiet(0);
actor->next_think_idx = 6;
actor->next_think_idx = aMJN2_THINK_EXIT;
}
static void aMJN2_norm_talk_request(ACTOR* actorx, GAME* game) {
@@ -80,7 +80,7 @@ static int aMJN2_talk_end_chk(ACTOR* actorx, GAME* game) {
actor->talk_proc(actor, play);
if (mDemo_CAN_ACTOR_TALK(actorx)) {
switch (actor->next_think_idx) {
case 3:
case aMJN2_THINK_WAIT:
mBGMPsComp_delete_ps_quietField();
break;
}
src/actor/npc/ac_npc_shasho_move.c_inc
+1 -1
View File
@@ -65,7 +65,7 @@ static void aNSS_enter_back_door(ACTOR* actorx, GAME* game) {
if (shasho_actor->npc_class.draw.main_animation_state == cKF_STATE_STOPPED) {
aNSS_setupAction(actorx, game, shasho_actor->next_action);
if (shasho_actor->action == 8)
if (shasho_actor->action == aNSS_ACT_EXIT_TURN_BACK_DECK)
shasho_actor->npc_class.draw.main_animation.keyframe.morph_counter = 0.0;
} else {
if (cKF_FrameControl_passCheck_now(&shasho_actor->npc_class.draw.main_animation.keyframe.frame_control,