mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-18 13:13:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename many music related symbols

Browse Source
This commit is contained in:
Ryan Dwyer
2020-08-29 00:41:53 +10:00
parent 34f6cf9316
commit ae01166fd6
48 changed files with 514 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/setup/setupame.c
+8 -8
View File
@@ -2775,7 +2775,7 @@ u8 func0422_intro[] = {
set_stage_flag(STAGEFLAG_TRIGGER_INTRO)
yield
#else
set_sfx_track(MUSIC_DEFECTION_INTRO_SFX)
play_temporary_track(MUSIC_DEFECTION_INTRO_SFX)
// No yield in this loop!
label(0x07)
@@ -2787,7 +2787,7 @@ u8 func0422_intro[] = {
yield
set_stage_flag(STAGEFLAG_TRIGGER_INTRO)
yield
set_music_track(MUSIC_DEFECTION_INTRO)
play_cutscene_track(MUSIC_DEFECTION_INTRO)
label(0x08)
cmd01dd_if_something(0x01, /*goto*/ 0x2c)
@@ -3146,8 +3146,8 @@ u8 func0422_intro_042d[] = {
endloop(0x09)
label(0x06)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_savefile_flag(SAVEFILEFLAG_CI_TOUR_DONE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -3160,7 +3160,7 @@ u8 func0416_outro_from_menu[] = {
u8 func0416_outro[] = {
camera_movement(0x00f2)
set_music_track(MUSIC_DEFECTION_OUTRO)
play_cutscene_track(MUSIC_DEFECTION_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
@@ -3337,7 +3337,7 @@ u8 func1012_trigger_x_music[] = {
// the flag is only set during the outro cutscene, not during gameplay.
label(0x06)
if_stage_flag_eq(STAGEFLAG_LAB_ELEVATOR_CLOSED, TRUE, /*goto*/ 0x2c)
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
label(0x2c)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -3478,7 +3478,7 @@ u8 func0422_intro_speaking[] = {
endloop(0xb7)
label(0x2c)
set_sfx_track(MUSIC_DEFECTION_INTRO_SFX)
play_temporary_track(MUSIC_DEFECTION_INTRO_SFX)
// No yield in this loop!
label(0xb8)
@@ -3487,7 +3487,7 @@ u8 func0422_intro_speaking[] = {
goto_first(0xb8)
label(0x2c)
set_music_track(MUSIC_DEFECTION_INTRO)
play_cutscene_track(MUSIC_DEFECTION_INTRO)
label(0xb9)
cmd01dd_if_something(0x01, /*goto*/ 0x2c)
src/files/setup/setupark.c
+6 -6
View File
@@ -2053,7 +2053,7 @@ u8 func040d_cass[] = {
endloop(0x2c)
label(0x00)
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
beginloop(0x3f)
if_timer_gt(180, /*goto*/ 0x00)
@@ -2297,7 +2297,7 @@ u8 func1400_setup_counterop[] = {
};
u8 func100d_intro[] = {
set_music_track(MUSIC_EXTRACTION_INTRO)
play_cutscene_track(MUSIC_EXTRACTION_INTRO)
camera_movement(0x0138)
cmd0175(60)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
@@ -2394,8 +2394,8 @@ u8 func100d_intro[] = {
set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_00010000)
chr_do_animation(0x013a, -2, -1, 0x06, 0x00, CHR_INTRO_GUARD, 2)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
yield
chr_do_animation(0x020c, -1, -1, 0x06, 0x00, CHR_INTRO_GUARD, 2)
@@ -2407,8 +2407,8 @@ u8 func100d_intro[] = {
};
u8 func0412_outro[] = {
set_music_track(MUSIC_EXTRACTION_OUTRO)
set_sfx_track(MUSIC_EXTRACTION_OUTRO_SFX)
play_cutscene_track(MUSIC_EXTRACTION_OUTRO)
play_temporary_track(MUSIC_EXTRACTION_OUTRO_SFX)
camera_movement(0x0157)
set_object_flag2(OBJ_HOVERCOPTER, OBJFLAG2_INVISIBLE)
hide_object(OBJ_HOVERCOPTER)
src/files/setup/setupate.c
+2 -2
View File
@@ -363,8 +363,8 @@ u8 func1005_main[] = {
};
u8 func1003_init_audio[] = {
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
src/files/setup/setupazt.c
+4 -4
View File
@@ -403,7 +403,7 @@ u8 func1011_setup_snow[] = {
u8 func1002_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_CRASHSITE_INTRO)
play_cutscene_track(MUSIC_CRASHSITE_INTRO)
camera_movement(0x01b5)
cmd0175(60)
@@ -515,8 +515,8 @@ u8 func1002_intro[] = {
unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)
chr_do_animation(0x01b6, -2, -1, 0x06, 0x00, CHR_BOND, 2)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_chr_hudpiece_visible(CHR_BOND, FALSE)
enter_firstperson
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -550,7 +550,7 @@ u8 func0402_outro[] = {
set_target_chr(CHR_COOP)
label(0x08)
camera_movement(0x01d9)
set_music_track(MUSIC_CRASHSITE_OUTRO)
play_cutscene_track(MUSIC_CRASHSITE_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN)
src/files/setup/setupcave.c
+9 -9
View File
@@ -781,7 +781,7 @@ u8 func0401_unused_cutscene[] = {
chr_draw_weapon_in_cutscene(CHR_BOND, WEAPON_FALCON2)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_AIRBASE_OUTRO_LONG)
play_cutscene_track(MUSIC_AIRBASE_OUTRO_LONG)
camera_movement(0x016b)
cmd0175(60)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
@@ -827,8 +827,8 @@ u8 func0401_unused_cutscene[] = {
set_ailist(0x01, 0x0405)
remove_chr(0x02)
set_ailist(CHR_STEWARDESS, 0x040b)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_ailist(CHR_SELF, GAILIST_END_CINEMA)
endlist
};
@@ -837,7 +837,7 @@ u8 func0425_outro[] = {
fade_to_color(0x000000ff, 0)
fade_to_color(0x00000000, 110)
camera_movement(0x031a)
set_music_track(MUSIC_AIRBASE_OUTRO)
play_cutscene_track(MUSIC_AIRBASE_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
@@ -1767,7 +1767,7 @@ u8 func1007_console_activation[] = {
label(0x31)
set_object_image(OBJ_CONSOLE, 0x01, 0x14)
play_x_music(0x58, 88) // @bug? Invalid channel
play_x_track(XREASON_DEFAULT, 88, 88)
beginloop(0x06)
chr_toggle_p1p2(CHR_SELF)
@@ -1775,7 +1775,7 @@ u8 func1007_console_activation[] = {
endloop(0x06)
label(0x02)
stop_music_channel(CHANNEL_1)
stop_x_track(XREASON_DEFAULT)
label(0x0c)
mute_channel(CHANNEL_1)
@@ -3591,7 +3591,7 @@ u8 func1003_intro[] = {
label(0x31)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_AIRBASE_INTRO)
play_cutscene_track(MUSIC_AIRBASE_INTRO)
camera_movement(0x01e5)
cmd0175(60)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
@@ -3850,8 +3850,8 @@ u8 func1003_intro[] = {
set_ailist(0x00, 0x0405)
set_ailist(0x01, 0x0405)
set_ailist(CHR_STEWARDESS, AILIST_STEWARDESS)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
src/files/setup/setupdam.c
+4 -4
View File
@@ -683,7 +683,7 @@ u8 func0408_guard_unalerted[] = {
};
u8 func1002_intro[] = {
set_music_track(MUSIC_PELAGIC_INTRO)
play_cutscene_track(MUSIC_PELAGIC_INTRO)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
camera_movement(0x02ce)
@@ -828,15 +828,15 @@ u8 func1002_intro[] = {
endloop(0x0c)
label(0x04)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
u8 func0c01_outro[] = {
camera_movement(0x02e2)
set_music_track(MUSIC_PELAGIC_OUTRO)
play_cutscene_track(MUSIC_PELAGIC_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
src/files/setup/setupdepo.c
+8 -8
View File
@@ -1363,7 +1363,7 @@ u8 func1010_safe_cracking[] = {
label(0x06)
speak(CHR_BOND, L_DEPO(38), 0x7754, CHANNEL_5, COLOR_00_GREEN) // "INTRUDER ALERT - all security to the vault."
play_x_music(CHANNEL_10, 180)
play_x_track(XREASON_DEFAULT, 10, 180)
yield
set_countdown_timer(60)
show_hudmsg(CHR_P1P2, L_DEPO(36)) // "Initiating cracking routines."
@@ -1572,7 +1572,7 @@ u8 func1017_check_lasers_closed[] = {
u8 func040d_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_INTRO)
play_cutscene_track(MUSIC_G5_INTRO)
camera_movement(0x0165)
cmd0175(60)
@@ -1796,8 +1796,8 @@ u8 func040d_intro[] = {
set_chr_chrflag(CHR_INTRO_VICTIM, CHRCFLAG_00010000)
chr_do_animation(0x0167, -2, -1, 0x06, 0x00, CHR_INTRO_VICTIM, 2)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
chr_do_animation(0x022a, -1, -1, 0x06, 0x00, CHR_INTRO_VICTIM, 2)
chr_drop_weapon(CHR_INTRO_VICTIM)
@@ -1825,7 +1825,7 @@ u8 func040e_meeting_cutscene[] = {
deactivate_alarm
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_MIDCUTSCENE)
play_cutscene_track(MUSIC_G5_MIDCUTSCENE)
camera_movement(0x0191)
set_stage_flag(STAGEFLAG_MEETING_STARTED)
set_ailist(CHR_BLONDE, GAILIST_IDLE)
@@ -2049,8 +2049,8 @@ u8 func040e_meeting_cutscene[] = {
label(0x54)
label(0x06)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
set_stage_flag(STAGEFLAG_MEETING_FINISHED)
mute_channel(CHANNEL_10)
@@ -2092,7 +2092,7 @@ u8 func040f_outro_from_menu[] = {
u8 func040f_outro[] = {
camera_movement(0x0196)
set_music_track(MUSIC_G5_OUTRO)
play_cutscene_track(MUSIC_G5_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
src/files/setup/setupdish.c
+6 -6
View File
@@ -5744,15 +5744,15 @@ u8 func1035_manage_music[] = {
reloop(0x8f)
label(0x2f)
play_music_track(MUSIC_CI_TRAINING)
play_track_isolated(MUSIC_CI_TRAINING)
beginloop(0x08)
if_stage_flag_eq(STAGEFLAG_IN_TRAINING, FALSE, /*goto*/ 0x06)
endloop(0x08)
label(0x06)
restart_music
reset_ambience
play_default_tracks
stop_ambient_track
endloop(0x8f)
endlist
@@ -5822,7 +5822,7 @@ u8 func1000_jo_typing[] = {
camera_movement(0x0484)
cmd0175(60)
if_controller_button_pressed(/*goto*/ 0x7b)
set_music_track(MUSIC_CI_INTRO)
play_cutscene_track(MUSIC_CI_INTRO)
unset_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)
@@ -5869,8 +5869,8 @@ u8 func1000_jo_typing[] = {
yield
yield
yield
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
src/files/setup/setupear.c
+4 -4
View File
@@ -2225,7 +2225,7 @@ u8 func100e_experiment_terminals_destroyed[] = {
};
u8 func0416_intro[] = {
set_music_track(MUSIC_INVESTIGATION_INTRO)
play_cutscene_track(MUSIC_INVESTIGATION_INTRO)
camera_movement(0x00f5)
cmd0175(60)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
@@ -2339,8 +2339,8 @@ u8 func0416_intro[] = {
unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
yield
chr_do_animation(0x020b, -1, -1, 0x06, 0x00, CHR_INTRO_GUARD, 2)
@@ -2351,7 +2351,7 @@ u8 func0416_intro[] = {
};
u8 func0417_outro[] = {
set_music_track(MUSIC_INVESTIGATION_OUTRO)
play_cutscene_track(MUSIC_INVESTIGATION_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_stage_flag(STAGEFLAG_TRIGGER_OUTRO_AUDIO)
src/files/setup/setupeld.c
+13 -13
View File
@@ -783,10 +783,10 @@ u8 func1002_intro[] = {
label(0x2e)
chr_do_animation(0x0172, -1, -1, 0x06, 0x00, CHR_BOND, 4)
remove_chr(CHR_NEGOTIATOR)
set_music_track(MUSIC_VILLA_INTRO3)
play_cutscene_track(MUSIC_VILLA_INTRO3)
goto_next(0x06)
label(0x2d)
set_music_track(MUSIC_VILLA_INTRO2)
play_cutscene_track(MUSIC_VILLA_INTRO2)
chr_do_animation(0x0172, -1, -1, 0x06, 0x00, CHR_NEGOTIATOR, 4)
label(0x06)
set_chr_chrflag(CHR_TAKER1, CHRCFLAG_UNPLAYABLE)
@@ -1116,9 +1116,9 @@ u8 func1002_intro[] = {
chr_do_animation(0x01ba, -2, -1, 0x06, 0x00, CHR_TAKER2, 2)
hide_object(OBJ_DROPSHIP)
restart_default_music
reset_ambience
play_x_music(CHANNEL_10, 30)
stop_cutscene_track
stop_ambient_track
play_x_track(XREASON_DEFAULT, 10, 30)
unset_stage_flag(STAGEFLAG_PLAYING_INTRO_FROM_MENU)
enter_firstperson
yield
@@ -1212,9 +1212,9 @@ u8 func1002_intro[] = {
set_chr_chrflag(CHR_TAKER2, CHRCFLAG_00000001)
chr_do_animation(0x01c1, -2, -1, 0x06, 0x00, CHR_TAKER2, 2)
hide_object(OBJ_DROPSHIP)
restart_default_music
reset_ambience
play_x_music(CHANNEL_10, 30)
stop_cutscene_track
stop_ambient_track
play_x_track(XREASON_DEFAULT, 10, 30)
enter_firstperson
yield
set_ailist(CHR_TAKER1, AILIST_TAKER)
@@ -1233,7 +1233,7 @@ u8 func0c02_outro_from_menu[] = {
u8 func0408_outro[] = {
camera_movement(0x017a)
set_music_track(MUSIC_VILLA_OUTRO)
play_cutscene_track(MUSIC_VILLA_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
@@ -1383,8 +1383,8 @@ u8 func0408_outro[] = {
mute_channel(CHANNEL_7)
mute_channel(CHANNEL_6)
mute_channel(CHANNEL_5)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
end_level
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -1682,7 +1682,7 @@ u8 func0403_negotiator[] = {
label(0x06)
show_hudmsg(CHR_BOND, L_ELD(13)) // "Negotiator has escaped to safety."
set_stage_flag(STAGEFLAG_NEGOTIATOR_ESCAPED)
stop_music_channel(CHANNEL_1)
stop_x_track(XREASON_DEFAULT)
remove_chr(CHR_SELF)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -2183,7 +2183,7 @@ u8 func100b_invoke_hackers[] = {
unset_chr_chrflag(CHR_HACKER3, CHRCFLAG_HIDDEN)
rebuild_teams
rebuild_squadrons
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
set_countdown_timer(60)
show_countdown_timer
start_countdown_timer
src/files/setup/setupimp.c
+7 -7
View File
@@ -867,7 +867,7 @@ u8 func1009_autogun_switch3[] = {
u8 func0c01_outro[] = {
camera_movement(0x01a2)
set_music_track(MUSIC_DEFENSE_OUTRO)
play_cutscene_track(MUSIC_DEFENSE_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
@@ -1148,15 +1148,15 @@ u8 func0c01_outro[] = {
label(0xb8)
mute_channel(CHANNEL_10)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
end_level
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
u8 func1002_intro[] = {
set_music_track(MUSIC_DEFENSE_INTRO)
play_cutscene_track(MUSIC_DEFENSE_INTRO)
camera_movement(0x02bc)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
@@ -1523,8 +1523,8 @@ u8 func1002_intro[] = {
set_object_flag3(0x53, OBJFLAG3_00000010)
object_do_animation(0x02c6, 0x53, 0x04, 0xfffe)
set_stage_flag(STAGEFLAG_INTRO_FINISHED)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
remove_chr(0x19)
@@ -2862,7 +2862,7 @@ u8 func1014_carrington_messages[] = {
endloop(0xc6)
label(0x08)
play_x_music(CHANNEL_10, 120)
play_x_track(XREASON_DEFAULT, 10, 120)
set_countdown_timer(120)
show_countdown_timer
start_countdown_timer
src/files/setup/setuplee.c
+6 -6
View File
@@ -1917,7 +1917,7 @@ u8 func100c_engineroom[] = {
if_chr_dead(CHR_ELVIS, /*goto*/ 0x2c)
if_chr_knockedout(CHR_ELVIS, /*goto*/ 0x2c)
set_ailist(CHR_ELVIS, AILIST_ELVIS_RUN_FROM_ENGINEROOM)
play_x_music(CHANNEL_10, 10)
play_x_track(XREASON_DEFAULT, 10, 10)
speak(CHR_BOND, L_LEE(46), 0x73d7, CHANNEL_6, COLOR_04_ORANGE) // "We have to get out of here!"
label(0x2c)
set_countdown_timer(10)
@@ -2532,7 +2532,7 @@ u8 func1011_check_end_level[] = {
u8 func1003_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_ATTACKSHIP_INTRO)
play_cutscene_track(MUSIC_ATTACKSHIP_INTRO)
camera_movement(0x01c2)
cmd0175(60)
@@ -2782,8 +2782,8 @@ u8 func1003_intro[] = {
chr_move_to_pad(CHR_CASS, 0x00df, 0x01, /*goto*/ 0x2c)
label(0x2c)
set_ailist(CHR_CASS, AILIST_CASS)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
@@ -2798,7 +2798,7 @@ u8 func0c01_outro[] = {
label(0x06)
hide_object(0x2c)
camera_movement(0x01e1)
set_music_track(MUSIC_ATTACKSHIP_OUTRO)
play_cutscene_track(MUSIC_ATTACKSHIP_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN)
@@ -3468,7 +3468,7 @@ u8 func101e_bridge_music[] = {
endloop(0x04)
label(0x2c)
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
src/files/setup/setuplip.c
+7 -7
View File
@@ -2127,7 +2127,7 @@ u8 func100e_elvis_timer[] = {
label(0x06)
set_stage_flag(STAGEFLAG_ENTERED_ELVIS_AREA)
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
set_countdown_timer(60)
show_countdown_timer
start_countdown_timer
@@ -3646,7 +3646,7 @@ u8 func1023_setup_door_locks[] = {
u8 func0c01_outro[] = {
set_invincible(CHR_BOND)
camera_movement(0x0198)
set_music_track(MUSIC_RESCUE_OUTRO)
play_cutscene_track(MUSIC_RESCUE_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
@@ -3743,8 +3743,8 @@ u8 func0c01_outro[] = {
label(0x8b)
mute_channel(CHANNEL_10)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
end_level
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -3753,7 +3753,7 @@ u8 func0c01_outro[] = {
u8 func1002_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_RESCUE_INTRO)
play_cutscene_track(MUSIC_RESCUE_INTRO)
camera_movement(0x01c6)
cmd0175(60)
@@ -3927,8 +3927,8 @@ u8 func1002_intro[] = {
object_do_animation(0x01ca, OBJ_CRATE, 0x01, 0xfffe)
close_door(0x33)
close_door(0x34)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
yield
set_chr_chrflag(CHR_INTRO_DEAD_GUARD, CHRCFLAG_00010000)
src/files/setup/setuplue.c
+6 -6
View File
@@ -1350,7 +1350,7 @@ u8 func100b_final_hangar[] = {
label(0x2e)
set_stage_flag(STAGEFLAG_ENTERED_FINAL_HANGAR)
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
restart_timer
unlock_door(0x11, 0x08)
unlock_door(0x12, 0x08)
@@ -1778,7 +1778,7 @@ u8 func040e_outro[] = {
open_door(0x11)
hide_object(OBJ_HOVERBIKE)
camera_movement(0x017d)
set_music_track(MUSIC_INFILTRATION_OUTRO)
play_cutscene_track(MUSIC_INFILTRATION_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
@@ -1922,7 +1922,7 @@ u8 func0410_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
if_controller_button_pressed(/*goto*/ 0x54)
set_music_track(MUSIC_INFILTRATION_INTRO)
play_cutscene_track(MUSIC_INFILTRATION_INTRO)
camera_movement(0x0181)
set_chr_chrflag(0x0c, CHRCFLAG_HIDDEN)
set_chr_chrflag(0x0d, CHRCFLAG_HIDDEN)
@@ -2132,8 +2132,8 @@ u8 func0410_intro[] = {
unset_object_flag2(OBJ_INTERCEPTOR1, OBJFLAG2_INVISIBLE)
unset_object_flag2(OBJ_INTERCEPTOR2, OBJFLAG2_INVISIBLE)
unset_object_flag2(OBJ_INTERCEPTOR3, OBJFLAG2_INVISIBLE)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
set_stage_flag(STAGEFLAG_INTRO_FINISHED)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2426,7 +2426,7 @@ u8 func1011_bunker_explosives[] = {
label(0x2e)
show_hudmsg(CHR_P1P2, L_LUE(75)) // "Foreign object detected - security alerted."
label(0x06)
play_x_music(CHANNEL_10, 20)
play_x_track(XREASON_DEFAULT, 10, 20)
yield
show_countdown_timer
start_countdown_timer
src/files/setup/setupold.c
+3 -3
View File
@@ -45,7 +45,7 @@ struct path paths[] = {
u8 func0c00_017c[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_INTRO)
play_cutscene_track(MUSIC_G5_INTRO)
camera_movement(0x045d)
title_init_mode(TITLEAIMODE_RARELOGO)
@@ -155,8 +155,8 @@ u8 func0c00_017c[] = {
endloop(0x15)
label(0x59)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
src/files/setup/setuppam.c
+8 -8
View File
@@ -1492,7 +1492,7 @@ u8 func0c01_midcutscene[] = {
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_ailist(CHR_ELVIS, GAILIST_IDLE)
set_music_track(MUSIC_DEEPSEA_MIDCUTSCENE)
play_cutscene_track(MUSIC_DEEPSEA_MIDCUTSCENE)
camera_movement(0x01d4)
set_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE)
unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN)
@@ -1843,9 +1843,9 @@ u8 func0c01_midcutscene[] = {
chr_move_to_pad(CHR_BOND, 0x019f, 0x01, /*goto*/ 0x2e)
label(0x2e)
set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)
restart_default_music
reset_ambience
play_x_music(CHANNEL_10, 60)
stop_cutscene_track
stop_ambient_track
play_x_track(XREASON_DEFAULT, 10, 60)
set_ailist(CHR_ELVIS, GAILIST_IDLE)
chr_move_to_pad(CHR_ELVIS, 0x0017, 0x01, /*goto*/ 0x2e)
label(0x2e)
@@ -1878,7 +1878,7 @@ u8 func0c02_outro[] = {
hide_countdown_timer
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_DEEPSEA_OUTRO)
play_cutscene_track(MUSIC_DEEPSEA_OUTRO)
camera_movement(0x02d7)
set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_BOND, CHRCFLAG_INVINCIBLE_TO_GUNFIRE)
@@ -2029,7 +2029,7 @@ u8 func1002_intro[] = {
chr_draw_weapon_in_cutscene(CHR_BOND, WEAPON_FALCON2_SCOPE)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_DEEPSEA_INTRO)
play_cutscene_track(MUSIC_DEEPSEA_INTRO)
camera_movement(0x01ef)
cmd0175(60)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
@@ -2206,8 +2206,8 @@ u8 func1002_intro[] = {
label(0x45)
hide_object(0x07)
label(0x46)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
label(0x0d)
enter_firstperson
yield
src/files/setup/setuppete.c
+5 -5
View File
@@ -501,7 +501,7 @@ u8 func0401_3ae8[] = {
set_stage_flag(STAGEFLAG_TRIGGER_INTRO)
if_controller_button_pressed(/*goto*/ 0x00)
camera_movement(0x00cf)
set_music_track(MUSIC_CHICAGO_INTRO)
play_cutscene_track(MUSIC_CHICAGO_INTRO)
set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN)
chicago_car_do_animation(OBJ_CAR1, 0x00d6)
@@ -638,8 +638,8 @@ u8 func0405_3d50[] = {
set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)
chr_do_animation(0x00df, -2, -1, 0x06, 0x00, CHR_BOND, 2)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
set_stage_flag(STAGEFLAG_INTRO_FINISHED)
enter_firstperson
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2244,7 +2244,7 @@ u8 func100d_spawn_alarm_responders[] = {
endloop(0x1e)
label(0x03)
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
goto_next(0x04)
// When the alarm sounds, there are 4 groups of people who respond.
@@ -2674,7 +2674,7 @@ u8 func040a_intro_sfx[] = {
u8 func040b_outro[] = {
camera_movement(0x0178)
set_music_track(MUSIC_CHICAGO_OUTRO)
play_cutscene_track(MUSIC_CHICAGO_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_ailist(CHR_P1P2, GAILIST_IDLE)
src/files/setup/setuprit.c
+9 -9
View File
@@ -1933,7 +1933,7 @@ u8 func100c_cockpit[] = {
set_object_image(0x03, 0x00, 0x13)
set_stage_flag(STAGEFLAG_PLANE_STABILIZED)
show_hudmsg(CHR_BOND, L_RIT(28)) // "Pilots have been saved."
reset_ambience
stop_ambient_track
set_ailist(CHR_SELF, GAILIST_IDLE)
// Unreachable
@@ -2020,7 +2020,7 @@ u8 func0428_start_path02[] = {
u8 func1002_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_AIRFORCEONE_INTRO)
play_cutscene_track(MUSIC_AIRFORCEONE_INTRO)
camera_movement(0x018c)
set_chr_chrflag(0x30, CHRCFLAG_UNPLAYABLE)
unset_chr_chrflag(0x30, CHRCFLAG_HIDDEN)
@@ -2184,8 +2184,8 @@ u8 func1002_intro[] = {
label(0x06)
chr_do_animation(0x01d1, -2, -1, 0x06, 0x00, CHR_BOND, 2)
label(0x2d)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
unset_chr_chrflag(0x13, CHRCFLAG_HIDDEN)
unset_chr_chrflag(0x14, CHRCFLAG_HIDDEN)
set_ailist(CHR_PRESIDENT, AILIST_INIT_PRESIDENT)
@@ -3440,7 +3440,7 @@ u8 func0423_outro[] = {
set_target_chr(CHR_COOP)
label(0x06)
camera_movement(0x02d8)
set_music_track(MUSIC_AIRFORCEONE_OUTRO)
play_cutscene_track(MUSIC_AIRFORCEONE_OUTRO)
misc_command(0x0000, 0x0d, 0x00)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
@@ -3552,7 +3552,7 @@ u8 func0423_outro[] = {
label(0x5f)
mute_channel(CHANNEL_10)
label(0x06)
restart_default_music
stop_cutscene_track
misc_command(0x0000, 0x0d, 0x00)
hide_object(0x19)
hide_object(0x1a)
@@ -3573,7 +3573,7 @@ u8 func1019_midcutscene[] = {
if_stage_flag_eq(STAGEFLAG_MIDCUTSCENE_STARTED, TRUE, /*goto*/ 0x2d)
set_stage_flag(STAGEFLAG_MIDCUTSCENE_STARTED)
dprint 'm','i','d',' ','c','u','t','s','c','e','n','e','\n',0,
set_music_track(MUSIC_AIRFORCEONE_MIDCUTSCENE)
play_cutscene_track(MUSIC_AIRFORCEONE_MIDCUTSCENE)
label(0x2d)
camera_movement(0x02df)
@@ -3607,8 +3607,8 @@ u8 func1019_midcutscene[] = {
hide_object(0x19)
label(0x06)
set_stage_flag(STAGEFLAG_MIDCUTSCENE_FINISHED)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_ailist(CHR_SELF, GAILIST_END_CINEMA)
src/files/setup/setupsev.c
+4 -4
View File
@@ -1520,7 +1520,7 @@ u8 func100b_check_medlab_escapable[] = {
u8 func1002_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_INTRO)
play_cutscene_track(MUSIC_G5_INTRO)
camera_movement(0x0476)
cmd0175(60)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
@@ -1573,8 +1573,8 @@ u8 func1002_intro[] = {
unset_object_flag2(OBJ_TROLLEY, OBJFLAG2_04000000)
set_object_flag3(OBJ_TROLLEY, OBJFLAG3_00000010)
object_do_animation(0x0478, OBJ_TROLLEY, 0x04, 0xfffe)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -1584,7 +1584,7 @@ u8 func041b_outro[] = {
set_invincible(CHR_BOND)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_OUTRO)
play_cutscene_track(MUSIC_G5_OUTRO)
camera_movement(0x0479)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
src/files/setup/setupsho.c
+9 -9
View File
@@ -1852,7 +1852,7 @@ u8 func100a_army_room[] = {
set_lights_state(0x0082, LIGHTOP_3, 0x06, 0xff, 0x78)
set_lights_state(0x0087, LIGHTOP_3, 0x06, 0xff, 0x78)
set_stage_flag(STAGEFLAG_TRIGGER_SKEDAR_ARMY)
play_x_music(CHANNEL_10, 60)
play_x_track(XREASON_DEFAULT, 10, 60)
set_ailist(CHR_SELF, GAILIST_IDLE)
goto_first(0x04)
@@ -1944,8 +1944,8 @@ u8 func040c_king_waiting[] = {
endloop(0x08)
label(0x2d)
stop_music_channel(-1)
play_music_track(MUSIC_SKEDARRUINS_KING)
stop_x_track(-1)
play_track_isolated(MUSIC_SKEDARRUINS_KING)
restart_timer
beginloop(0x09)
@@ -2543,7 +2543,7 @@ u8 func040f_update_spike_stageflags[] = {
u8 func0c00_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_SKEDARRUINS_INTRO)
play_cutscene_track(MUSIC_SKEDARRUINS_INTRO)
set_stage_flag(STAGEFLAG_IN_INTRO)
set_chr_chrflag(CHR_BOND, CHRCFLAG_RUNFASTER)
set_chr_chrflag(CHR_KING2, CHRCFLAG_HIDDEN)
@@ -2797,8 +2797,8 @@ u8 func0c00_intro[] = {
set_object_flag2(0x2e, OBJFLAG2_04000000)
unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -2825,7 +2825,7 @@ u8 func0414_outro[] = {
label(0x06)
set_chr_chrflag(CHR_TARGET, CHRCFLAG_KILLCOUNTABLE)
camera_movement(0x044c)
set_music_track(MUSIC_SKEDARRUINS_OUTRO)
play_cutscene_track(MUSIC_SKEDARRUINS_OUTRO)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN)
@@ -2985,8 +2985,8 @@ u8 func0414_outro[] = {
hide_object(0x25)
hide_object(0x26)
label(0x06)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
end_level
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
src/files/setup/setupstat.c
+4 -4
View File
@@ -1067,7 +1067,7 @@ u8 unregistered_function[] = {
u8 func1002_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_INTRO)
play_cutscene_track(MUSIC_G5_INTRO)
set_chr_hiddenflag(CHR_ANTI, CHRHFLAG_00020000)
set_chr_hiddenflag(CHR_BLONDE, CHRHFLAG_00020000)
camera_movement(0x047c)
@@ -1134,8 +1134,8 @@ u8 func1002_intro[] = {
set_ailist(CHR_MAIAN1, AILIST_INIT_MAIAN)
set_ailist(CHR_MAIAN2, AILIST_INIT_MAIAN)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
yield
label(0x2d)
@@ -1147,7 +1147,7 @@ u8 func040b_outro[] = {
set_invincible(CHR_BOND)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_OUTRO)
play_cutscene_track(MUSIC_G5_OUTRO)
camera_movement(0x0480)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)
src/files/setup/setuptra.c
+14 -14
View File
@@ -979,7 +979,7 @@ u8 func0404_jonathan_following_and_mine[] = {
endloop(0x0c)
label(0x06)
play_x_music(CHANNEL_10, 30)
play_x_track(XREASON_DEFAULT, 10, 30)
restart_timer
try_face_entity(ENTITYTYPE_PAD, 0x0173, /*goto*/ 0xc4)
@@ -1279,7 +1279,7 @@ u8 func0413_jonathan_hangar[] = {
// Jon is up the ramp
label(0x33)
set_stage_flag(STAGEFLAG_HANGAR_X_MUSIC_STARTED)
play_x_music(CHANNEL_10, 90)
play_x_track(XREASON_DEFAULT, 10, 90)
run_to_pad(0x016f)
set_stage_flag(STAGEFLAG_HANGAR_X_MUSIC_STARTED)
if_chr_stopped(/*goto*/ 0x06)
@@ -1353,7 +1353,7 @@ u8 func0413_jonathan_hangar[] = {
label(0x06)
set_stage_flag(STAGEFLAG_JO_DOING_TERMINALS)
set_stage_flag(STAGEFLAG_HANGAR_X_MUSIC_STARTED)
play_x_music(CHANNEL_10, 90)
play_x_track(XREASON_DEFAULT, 10, 90)
set_ailist(CHR_SELF, AILIST_JONATHAN_AFTER_TERMINALS)
// Elvis dead
@@ -2468,7 +2468,7 @@ u8 func1019_enable_biotechs_after_stash[] = {
u8 func1002_intro[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_ESCAPE_INTRO)
play_cutscene_track(MUSIC_ESCAPE_INTRO)
camera_movement(0x019c)
cmd0175(60)
@@ -2783,8 +2783,8 @@ u8 func1002_intro[] = {
drop_concealed_items(0x23)
drop_concealed_items(0x24)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
revoke_control(CHR_BOND, 0)
yield
@@ -2800,7 +2800,7 @@ u8 func1002_intro[] = {
u8 func0c01_midcutscene[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_ESCAPE_MIDCUTSCENE)
play_cutscene_track(MUSIC_ESCAPE_MIDCUTSCENE)
camera_movement(0x01cb)
cmd0175(60)
hide_object(OBJ_HOVERBED)
@@ -2961,8 +2961,8 @@ u8 func0c01_midcutscene[] = {
label(0x68)
set_stage_flag(STAGEFLAG_INTRO_DONE)
mute_channel(CHANNEL_7)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
unset_chr_chrflag(CHR_TARGET, CHRCFLAG_UNPLAYABLE)
@@ -3016,7 +3016,7 @@ u8 func0c02_outro[] = {
set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_ESCAPE_OUTRO_LONG)
play_cutscene_track(MUSIC_ESCAPE_OUTRO_LONG)
camera_movement(0x02d2)
label(0x32)
hide_object(OBJ_UFO2)
@@ -3072,8 +3072,8 @@ u8 func0c02_outro[] = {
label(0x06)
hide_object(OBJ_UFO2)
if_stage_flag_eq(STAGEFLAG_JO_DOING_TERMINALS, FALSE, /*goto*/ 0x32)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
label(0x32)
goto_next(0x06)
@@ -3123,7 +3123,7 @@ u8 func0415_ufo_exit[] = {
label(0x06)
misc_command(0x0000, 0x0f, 0x00)
reset_ambience
stop_ambient_track
hide_object(OBJ_UFO1)
set_ailist(CHR_SELF, GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -3161,7 +3161,7 @@ u8 func1021_jo_escaping[] = {
stop_countdown_timer
label(0x62)
set_savefile_flag(SAVEFILEFLAG_DEFENSE_JON)
set_music_track(MUSIC_ESCAPE_OUTRO_LONG)
play_cutscene_track(MUSIC_ESCAPE_OUTRO_LONG)
camera_movement(0x02d4)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN)
src/files/setup/setupwax.c
+4 -4
View File
@@ -1937,7 +1937,7 @@ u8 func0416_intro[] = {
unset_object_flag(0x62, OBJFLAG_00000100)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_INTRO)
play_cutscene_track(MUSIC_G5_INTRO)
camera_movement(0x0472)
cmd0175(60)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
@@ -2004,8 +2004,8 @@ u8 func0416_intro[] = {
unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)
chr_do_animation(0x0473, -2, -1, 0x06, 0x00, CHR_BOND, 2)
restart_default_music
reset_ambience
stop_cutscene_track
stop_ambient_track
enter_firstperson
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -2016,7 +2016,7 @@ u8 func0417_outro[] = {
hide_object(OBJ_SHUTTLE1)
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN)
set_music_track(MUSIC_G5_OUTRO)
play_cutscene_track(MUSIC_G5_OUTRO)
camera_movement(0x0474)
set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE)
set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000)