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

Merge pull request #364 from Cuyler36:intro_demo_fixes

Browse Source 
Misc fixes and improvements for intro demo
This commit is contained in:
Cuyler36
2024-06-27 18:30:12 -04:00
committed by GitHub
parent e103ccd222 39b78bb289
commit b2ad419c13
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/audio_defs.h
+1 -1
View File
@@ -202,12 +202,12 @@ typedef enum bgm_e {
BGM_POLICE_BOX,
BGM_SAVE,
BGM_INTRO_ARRIVE,
BGM_INTRO_STATION,
BGM_INTRO_RCN_GUIDE,
BGM_INTRO_SELECT_HOUSE,
BGM_INTRO_SELECT_HOUSE2,
BGM_INTRO_FIND_SHOP,
BGM_INTRO_CHORES,
BGM_HALLOWEEN,
BGM_XMAS_EVE,
BGM_FIREWORKS_FESTIVAL,
BGM_CHERRY_BLOSSOM_FESTIVAL,
src/ac_intro_demo.c
+2 -2
View File
@@ -67,7 +67,7 @@ static void aID_actor_ct(ACTOR* actorx, GAME* game) {
intro_demo->_1A4 = TRUE;
intro_demo->next_action = aID_ACT_DECIDE_HOUSE;
aID_setupAction(intro_demo, play, aID_ACT_BIRTH_RCN_GUIDE);
mBGMPsComp_make_ps_demo(BGM_INTRO_STATION, 0x168);
mBGMPsComp_make_ps_demo(BGM_INTRO_RCN_GUIDE, 0x168);
break;
default:
aID_setupAction(intro_demo, play, 0);
@@ -89,7 +89,7 @@ static void aID_actor_dt(ACTOR* actorx, GAME* game) {
}
if (intro_demo->first_field_bgm_state == 2) {
mBGMPsComp_delete_ps_fieldSuddenEv(BGM_INTRO_SELECT_HOUSE2, 0x168);
mBGMPsComp_delete_ps_fieldSuddenEv(BGM_INTRO_FIND_SHOP, 0x168);
}
}
src/ac_intro_demo_move.c_inc
+2 -2
View File
@@ -5,7 +5,7 @@ static void aID_change_player_demo_standing_train(GAME* game) {
}
static void aID_set_first_field_bgm(INTRO_DEMO_ACTOR* intro_demo) {
mBGMPsComp_make_ps_fieldSuddenEv(BGM_INTRO_SELECT_HOUSE2, 0x168, 1);
mBGMPsComp_make_ps_fieldSuddenEv(BGM_INTRO_FIND_SHOP, 0x168, 1);
mBGMPsComp_scene_mode(1);
intro_demo->first_field_bgm_state = 2;
}
@@ -258,7 +258,7 @@ static void aID_decide_house_init(INTRO_DEMO_ACTOR* intro_demo, GAME_PLAY* play)
static void aID_retire_rcn_guide_wait_init(INTRO_DEMO_ACTOR* intro_demo, GAME_PLAY* play) {
mPlib_request_main_demo_wait_type1(&play->game, 0, NULL);
mBGMPsComp_delete_ps_demo(BGM_INTRO_SELECT_HOUSE, 0x168);
mBGMPsComp_delete_ps_demo(BGM_INTRO_SELECT_HOUSE2, 0x168);
mBGMPsComp_make_ps_fc_quiet(0x2D0);
intro_demo->first_field_bgm_state = 1;
}
src/ac_npc_rcn_guide.c
+3 -2
View File
@@ -141,8 +141,9 @@ static void aNRG_actor_save(ACTOR* actorx, GAME* game) {
static void aNRG_actor_dt(ACTOR* actorx, GAME* game) {
NPC_RCN_GUIDE_ACTOR* rcn_guide = (NPC_RCN_GUIDE_ACTOR*)actorx;
if (rcn_guide->think_idx == 16) {
mBGMPsComp_delete_ps_demo(BGM_INTRO_STATION, 0x168);
/* Stop playing the initial intro music when destruct due to entering a house */
if (rcn_guide->think_idx == aNRC_THINK_WAIT) {
mBGMPsComp_delete_ps_demo(BGM_INTRO_RCN_GUIDE, 0x168);
}
Common_Get(clip).npc_clip->dt_proc(actorx, game);
src/ac_npc_rcn_guide_schedule.c_inc
+3 -2
View File
@@ -40,7 +40,8 @@ static void aNRG_decide_house_wait(NPC_RCN_GUIDE_ACTOR* rcn_guide, GAME_PLAY* pl
int next_think_idx = -1;
if (GET_PLAYER_ACTOR_NOW()->cancel_wade_flag) {
next_think_idx = 7;
/* Player is trying to leave the acre, so let them know they can't */
next_think_idx = aNRC_THINK_STOP_WADE;
} else if (Common_Get(clip).demo_clip != NULL && Common_Get(clip).demo_clip->type == mDemo_CLIP_TYPE_INTRO_DEMO) {
ACTOR* demo_actor = (ACTOR*)Common_Get(clip).demo_clip->demo_class;
@@ -243,7 +244,7 @@ static void aNRG_exit_turn_init(NPC_RCN_GUIDE_ACTOR* rcn_guide, GAME_PLAY* play)
intro_demo->talk_flag = TRUE;
}
}
rcn_guide->next_think_idx = 15;
rcn_guide->next_think_idx = aNRC_THINK_EXIT;
}
static void aNRG_setup_think_proc(NPC_RCN_GUIDE_ACTOR* rcn_guide, GAME_PLAY* play, int think_idx) {
src/ac_npc_rcn_guide_talk.c_inc
+1 -1
View File
@@ -62,7 +62,7 @@ static void aNRG_demo_end_wait_talk_proc(NPC_RCN_GUIDE_ACTOR* rcn_guide, GAME_PL
mMsg_Window_c* msg_p = mMsg_Get_base_window_p();
aNRG_set_shop_address(rcn_guide);
rcn_guide->next_think_idx = 14;
rcn_guide->next_think_idx = aNRC_THINK_EXIT_TURN;
mMsg_request_main_appear_wait_type1(msg_p);
mMsg_Set_ForceNext(msg_p);
aNRG_demand_payment_change_talk_proc(rcn_guide, aNRG_TALK_FINISHED);