mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-02 19:35:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some comments and white space issues

Browse Source
This commit is contained in:
Ryan Dwyer
2022-07-15 17:57:31 +10:00
parent be2c057d7a
commit 11699d5a11
33 changed files with 2608 additions and 2960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/setup/setupame.c
+11 -29
View File
@@ -1124,28 +1124,30 @@ u8 func0404_init_hovercar[] = {
assign_path(path) \
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) \
endlist \
};
endlist
u8 func0405_start_path26[] = {
do_path(26)
};
u8 func0406_start_path27[] = {
do_path(27)
};
u8 func0407_start_path28[] = {
do_path(28)
};
u8 func0408_start_path29[] = {
do_path(29)
};
u8 func0409_start_path30[] = {
do_path(30)
};
u8 func040a_start_path31[] = {
set_chr_dodge_rating(2, 0x14)
set_chr_dodge_rating(2, 20)
set_unarmeddodgerating(0)
set_accuracy(0)
set_reaction_speed(0)
@@ -1161,7 +1163,7 @@ u8 func040a_start_path31[] = {
};
u8 func040b_start_path32[] = {
set_chr_dodge_rating(2, 0x14)
set_chr_dodge_rating(2, 20)
set_unarmeddodgerating(0)
set_accuracy(0)
set_reaction_speed(0)
@@ -1176,7 +1178,7 @@ u8 func040b_start_path32[] = {
};
u8 func040c_start_path33[] = {
set_chr_dodge_rating(2, 0x14)
set_chr_dodge_rating(2, 20)
set_unarmeddodgerating(0)
set_accuracy(0)
set_reaction_speed(0)
@@ -1191,7 +1193,7 @@ u8 func040c_start_path33[] = {
};
u8 func040d_start_path34[] = {
set_chr_dodge_rating(2, 0x14)
set_chr_dodge_rating(2, 20)
set_unarmeddodgerating(0)
set_accuracy(10)
set_reaction_speed(0)
@@ -2534,8 +2536,6 @@ u8 func1002_objectives_failed_msg[] = {
if_controller_button_pressed(/*goto*/ 0x06) \
endloop(0x08)
u8 func041b_intro_041b[] = {
if_controller_button_pressed(/*goto*/ 0x36)
camera_movement(ANIM_00C9)
@@ -3394,7 +3394,7 @@ u8 func1012_trigger_x_music[] = {
};
#define init_guard(accuracy, health) \
set_chr_dodge_rating(2, 0x14) \
set_chr_dodge_rating(2, 20) \
set_unarmeddodgerating(0) \
set_accuracy(accuracy) \
set_reaction_speed(0) \
@@ -3403,8 +3403,6 @@ u8 func1012_trigger_x_music[] = {
set_recovery_speed(0) \
set_shield(0)
u8 func0417_init_dd_guard[] = {
init_guard(0, 40)
set_ailist(CHR_SELF, GAILIST_UNALERTED)
@@ -4183,19 +4181,3 @@ struct path paths[] = {
{ path35, 35, 0 },
{ NULL, 0, 0 },
};
src/files/setup/setuparec.c
-2
View File
@@ -46,5 +46,3 @@ struct path paths[] = {
struct ailist ailists[] = {
{ NULL, 0 },
};
src/files/setup/setupark.c
+5 -27
View File
@@ -834,7 +834,7 @@ u8 func0410_init_top_guard[] = {
if_difficulty_lt(DIFF_SA, /*goto*/ 0x20)
// SA and PA
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(80)
set_reaction_speed(10)
set_chr_maxdamage(CHR_SELF, 10)
@@ -845,7 +845,7 @@ u8 func0410_init_top_guard[] = {
// Agent
label(0x20)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(10)
set_chr_maxdamage(CHR_SELF, 10)
@@ -1494,8 +1494,6 @@ u8 func1005_check_bodyguards_dead[] = {
goto_next(0x00) \
label(goto)
beginloop(0x1f)
if_alive_goto_00(CHR_TOPGUARD5, 0x21)
if_alive_goto_00(CHR_TOPGUARD4, 0x22)
@@ -2383,8 +2381,6 @@ u8 func100d_intro[] = {
endloop(loopid) \
label(0x00)
wait_until(20, 0x61)
open_door(0x0c)
@@ -2543,8 +2539,6 @@ u8 func0412_outro[] = {
endloop(loopid) \
label(0x00)
outro_wait_until(0, 0x5f)
outro_wait_until(20, 0x5f)
outro_wait_until(47, 0x7e)
@@ -2690,7 +2684,7 @@ u8 func0412_outro[] = {
};
u8 func0413_defend_pad[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(10)
set_chr_maxdamage(CHR_SELF, 10)
@@ -2751,7 +2745,7 @@ u8 func1001_objectives_failed_msg[] = {
};
u8 func0414_init_shock[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(10)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2766,7 +2760,7 @@ u8 func0414_init_shock[] = {
* @unused
*/
u8 func0415_init_10hp[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(10)
set_chr_maxdamage(CHR_SELF, 10)
@@ -2883,8 +2877,6 @@ u8 func1016_msg_make_foyer_guards_alerted[] = {
increase_chr_alertness(100, chr) \
label(0x20)
label(0x20)
if_alive_set_alerted(0x01)
if_alive_set_alerted(0x02)
@@ -3265,17 +3257,3 @@ struct ailist ailists[] = {
{ func0412_outro, 0x0c01 },
{ NULL, 0 },
};
src/files/setup/setupate.c
-3
View File
@@ -588,6 +588,3 @@ struct ailist ailists[] = {
{ func0407_trent_init, 0x0407 },
{ NULL, 0 },
};
src/files/setup/setupazt.c
+4 -8
View File
@@ -495,8 +495,6 @@ u8 func1002_intro[] = {
endloop(loopid) \
label(0x08)
wait_until(724, 0x69)
speak(CHR_BOND, L_AZT_032, MP3_0759, CHANNEL_10, COLOR_09_BLUE) // "Ahhh... uuhhhh..."
@@ -852,7 +850,7 @@ u8 func0407_init_blonde[] = {
};
u8 func0406_init_stripes[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(16)
set_reaction_speed(55)
set_chr_maxdamage(CHR_SELF, 60)
@@ -922,7 +920,7 @@ u8 func1006_msg_elvisbeable[] = {
};
#define init_path(pathid, function) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(16) \
set_reaction_speed(55) \
set_chr_maxdamage(CHR_SELF, 60) \
@@ -934,8 +932,6 @@ u8 func1006_msg_elvisbeable[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED_0004)
u8 func0408_start_path00[] = {
init_path(0, 0x0408)
endlist
@@ -1028,7 +1024,7 @@ u8 unregistered_function1[] = {
};
u8 func0415_unused[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(16)
set_reaction_speed(55)
set_chr_maxdamage(CHR_SELF, 60)
@@ -1112,7 +1108,7 @@ u8 func100c_spawn_dd_guards[] = {
};
u8 func0416_spawned_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(16)
set_reaction_speed(55)
set_chr_maxdamage(CHR_SELF, 60)
src/files/setup/setupcave.c
+8 -36
View File
@@ -877,8 +877,6 @@ u8 func0425_outro[] = {
endloop(loopid) \
label(0x02)
wait_until(38, 0x92)
play_sound(SFX_FOOTSTEP_80C4, CHANNEL_10)
@@ -1002,8 +1000,6 @@ u8 func1004_guard_activation[] = {
set_chr_flag_bankx(chr, CHRFLAG0_AIVSAI, BANK_0) \
yield
remove_alaskan_guard(0x00)
remove_alaskan_guard(0x01)
remove_alaskan_guard(0x02)
@@ -1052,8 +1048,6 @@ u8 func1004_guard_activation[] = {
unset_chr_chrflag(chr, CHRCFLAG_HIDDEN) \
yield
enable_takeover_guard2(0x15, AILIST_INIT_POSTTAKEOVER_GUARD)
enable_takeover_guard2(0x17, AILIST_INIT_POSTTAKEOVER_GUARD)
enable_takeover_guard2(0x21, AILIST_INIT_POSTTAKEOVER_GUARD)
@@ -1104,8 +1098,6 @@ u8 func1004_guard_activation[] = {
unset_chr_chrflag(chr, CHRCFLAG_HIDDEN) \
yield
label(0x02)
enable_bottom_guard(0x13)
enable_bottom_guard(0x14)
@@ -1119,7 +1111,7 @@ u8 func1004_guard_activation[] = {
};
u8 func0405_start_path15[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1405,8 +1397,6 @@ u8 func1005_check_civilians_killed[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED)
u8 func041b_start_path06[] = {
init_path(70, 40, 0, 0, 0x06)
endlist
@@ -1932,8 +1922,6 @@ u8 func1007_console_activation[] = {
label(0x08) \
set_ailist(CHR_SELF, GAILIST_IDLE)
u8 func1020_weapon_scanning_bond[] = {
yield
weapon_detection_logic(CHR_BOND)
@@ -2416,7 +2404,7 @@ u8 func100e_check_alaskans_killed[] = {
* @unused
*/
u8 func0410_unused[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(22)
set_reaction_speed(80)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2605,7 +2593,7 @@ u8 func040f_nsa[] = {
u8 func0412_init_takeover_lackey[] = {
set_shotlist(GAILIST_ALERTED)
set_self_chrflag(CHRCFLAG_00000040)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(60)
set_reaction_speed(80)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2831,8 +2819,6 @@ u8 func1010_setup_baggage_carrier[] = {
\
set_ailist(CHR_SELF, GAILIST_IDLE)
u8 func1011_lasers1[] = {
laser_overloaded_logic(0x07, 0x0c, 120)
endlist
@@ -2903,7 +2889,7 @@ u8 func1017_laser5[] = {
};
u8 func0403_unused[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(45)
set_chr_maxdamage(CHR_SELF, 60)
@@ -3060,7 +3046,7 @@ u8 func1016_console_noises[] = {
};
u8 func0426_init_alaskan_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3078,7 +3064,7 @@ u8 func0427_init_posttakeover_guard[] = {
set_self_chrflag(CHRCFLAG_00040000)
set_self_chrflag(CHRCFLAG_HIDDEN)
set_chr_team(CHR_SELF, TEAM_04)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(45)
set_chr_maxdamage(CHR_SELF, 60)
@@ -3130,7 +3116,7 @@ u8 func0428_posttakeover_guard[] = {
* @unused
*/
u8 func0429_unused[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(22)
set_reaction_speed(80)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3145,7 +3131,7 @@ u8 func0429_unused[] = {
* Assigned to two stripes guards in the foyer during takeover.
*/
u8 func042a_foyer_spawner[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(12)
set_reaction_speed(45)
set_chr_maxdamage(CHR_SELF, 60)
@@ -3245,8 +3231,6 @@ u8 func042c_foyer_clone[] = {
\
set_ailist(CHR_SELF, GAILIST_IDLE)
u8 func042d_hoverbot1[] = {
hoverbot_do_paths(0, 1, 2)
endlist
@@ -4471,15 +4455,3 @@ struct ailist ailists[] = {
{ func0425_outro, 0x0c01 },
{ NULL, 0 },
};
src/files/setup/setupdam.c
+5 -28
View File
@@ -674,7 +674,7 @@ u8 func1400_setup_counterop[] = {
u8 func0408_guard_unalerted[] = {
set_chr_cloaked(CHR_SELF, FALSE, TRUE)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(18)
set_reaction_speed(60)
set_chr_maxdamage(CHR_SELF, 70)
@@ -714,8 +714,6 @@ u8 func1002_intro[] = {
endloop(loopid) \
label(0x04)
wait_until(342, 0x3b)
play_sound(SFX_0171, CHANNEL_7)
@@ -1302,7 +1300,7 @@ u8 func100f_check_researchdata_collected[] = {
};
#define init_path(pathid) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(18) \
set_reaction_speed(60) \
set_chr_maxdamage(CHR_SELF, 70) \
@@ -1313,8 +1311,6 @@ u8 func100f_check_researchdata_collected[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED_0004)
u8 func0405_start_path00[] = {
init_path(0)
endlist
@@ -1342,11 +1338,6 @@ u8 func0407_start_path02[] = {
endlist
};
#define labtech_logic(function, pad1, pad2, pad3) \
u8 func040e_init_labtech1[] = {
set_self_chrflag(CHRCFLAG_KEEPCORPSEKO)
set_chr_maxdamage(CHR_SELF, 1)
@@ -1506,7 +1497,7 @@ u8 func0410_init_labtech3[] = {
u8 func040d_labtech3[] = {
// @bug: Wrong onshot function. Under normal gameplay this labtech has 1HP
// anyway and will die in one shot. Theroetically, if you use PD mode with
// anyway and will die in one shot. Theoretically, if you use PD mode with
// max health and shoot him with a weak weapon then he will start running to
// lab tech 1's pads.
set_shotlist(AILIST_LABTECH1)
@@ -2288,7 +2279,7 @@ u8 func1014_moonpool_switch[] = {
u8 func0413_guard_alerted[] = {
set_chr_cloaked(CHR_SELF, FALSE, TRUE)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(18)
set_reaction_speed(60)
set_chr_maxdamage(CHR_SELF, 70)
@@ -2356,8 +2347,6 @@ u8 func1015_shuffle_hatchswitches[] = {
unset_stage_flag(STAGEFLAG_HATCHSWITCH4_ACTIVATED) \
goto_first(0x00)
u8 func1016_hatchswitch1[] = {
hatchswitch_logic(OBJ_HATCHSWITCH1, STAGEFLAG_HATCHSWITCH1_ACTIVATED)
endlist
@@ -2850,9 +2839,7 @@ u8 func101d_alarm_switches[] = {
label(0x07)
goto_first(0x00)
// @bug: This function is surely not meant to be assigned here. But it has
// no consequences because the function will bail because CHR_SELF doesn't
// exist.
// Unreachable
set_ailist(CHR_SELF, AILIST_ELVIS_LEADING)
endlist
};
@@ -3014,13 +3001,3 @@ struct ailist ailists[] = {
{ func0413_guard_alerted, 0x0413 },
{ NULL, 0 },
};
src/files/setup/setupdepo.c
+7 -24
View File
@@ -512,7 +512,7 @@ s32 path03[] = {
};
u8 func0409_start_path00[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(5)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -526,7 +526,7 @@ u8 func0409_start_path00[] = {
};
u8 func040a_start_path01[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(5)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -540,7 +540,7 @@ u8 func040a_start_path01[] = {
};
u8 func040b_start_path02[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(5)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -554,7 +554,7 @@ u8 func040b_start_path02[] = {
};
u8 func040c_start_path03[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(5)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1078,7 +1078,7 @@ u8 func1009_spawner_during_decode[] = {
#define init_swat \
set_chr_hiddenflag(CHR_SELF, CHRHFLAG_00400000) \
set_self_flag_bankx(CHRFLAG1_NOIDLEANIMS, BANK_1) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(15) \
set_reaction_speed(25) \
set_chr_maxdamage(CHR_SELF, 40) \
@@ -1098,8 +1098,6 @@ u8 func1009_spawner_during_decode[] = {
rebuild_squadrons \
run_to_pad(PAD_DEPO_004E)
u8 func0401_init_swat1[] = {
init_swat
@@ -1834,8 +1832,6 @@ u8 func040d_intro[] = {
\
label(0x06)
u8 func040e_meeting_cutscene[] = {
deactivate_alarm
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)
@@ -2389,7 +2385,7 @@ u8 func0414_init_cloak2_guard[] = {
stop_chr
set_shotlist(AILIST_CLOAK_GUARD)
set_self_chrflag(CHRCFLAG_INVINCIBLE)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(5)
set_reaction_speed(25)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2600,7 +2596,7 @@ u8 func101d_init_mines[] = {
};
#define init_guard(accuracy, reaction, function) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(accuracy) \
set_reaction_speed(reaction) \
set_chr_maxdamage(CHR_SELF, 40) \
@@ -2609,8 +2605,6 @@ u8 func101d_init_mines[] = {
set_shield(0) \
set_ailist(CHR_SELF, function)
u8 func0406_init_type1_guard[] = {
init_guard(5, 30, GAILIST_UNALERTED)
endlist
@@ -3208,14 +3202,3 @@ struct path paths[] = {
{ path03, 3, PATHFLAG_CIRCULAR },
{ NULL, 0, 0 },
};
src/files/setup/setupdish.c
-24
View File
@@ -2846,8 +2846,6 @@ u8 func100e_training_unlockables[] = {
label(0x2f) \
endloop(0x04)
u8 func100f_doorproxy_unused1[] = {
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -3743,8 +3741,6 @@ u8 func101c_holo1_main[] = {
set_returnlist(CHR_SELF, function) \
set_ailist(CHR_SELF, AILIST_HOLO1_CHECK_DONE)
u8 func101d_holo1_switch1[] = {
holo1_some_terminal(0x4c, AILIST_HOLO1_SWITCH1)
endlist
@@ -3809,8 +3805,6 @@ u8 func1020_holo1_monitor_switches[] = {
\
label(0x09)
#define holo1_code_thing_p2(object1, object2, hint, msg) \
remove_hudmsgs \
show_hudmsg_middle(0x01, COLOR_04_ORANGE, hint) \
@@ -3844,8 +3838,6 @@ u8 func1020_holo1_monitor_switches[] = {
label(0x2f) \
goto_first(0x8f)
u8 func1021_holo1_code1[] = {
label(0x8f)
set_object_image(0x48, 0, TVCMDLIST_12)
@@ -4092,8 +4084,6 @@ u8 func1022_holo2_main[] = {
set_returnlist(CHR_SELF, function) \
set_ailist(CHR_SELF, 0x041b)
u8 func1023_holo2_object1[] = {
holo2_do_thing(0x54, 0x0431)
endlist
@@ -5906,8 +5896,6 @@ u8 func1035_manage_music[] = {
label(0x06) \
endloop(0x03)
u8 func1038_msg_pp7[] = {
do_gun_msg(0x1e, L_DISH_116) // "PP7"
endlist
@@ -6348,15 +6336,3 @@ struct path paths[] = {
{ path00, 0, PATHFLAG_CIRCULAR },
{ NULL, 0, 0 },
};
src/files/setup/setupear.c
+3 -22
View File
@@ -846,7 +846,7 @@ s32 path13[] = {
};
#define init_path(pathid) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(1) \
set_reaction_speed(20) \
set_chr_maxdamage(CHR_SELF, 40) \
@@ -857,8 +857,6 @@ s32 path13[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED_0004)
u8 func040c_start_path00[] = {
init_path(0)
endlist
@@ -2394,8 +2392,6 @@ u8 func0417_outro[] = {
endloop(loopid) \
label(0x06)
wait_for_camera(0x08)
dprint 's','h','o','t',' ','2',0,
@@ -2529,8 +2525,6 @@ u8 func1415_outro_audio[] = {
endloop(loopid) \
label(0x06)
outro_wait_until(78, 0x56)
play_sound(SFX_0161, CHANNEL_6)
@@ -3045,7 +3039,7 @@ u8 func1016_setup_drcaroll[] = {
};
u8 func040a_init_basic_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(1)
set_reaction_speed(20)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3057,7 +3051,7 @@ u8 func040a_init_basic_guard[] = {
};
u8 func040b_init_shock_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(11)
set_reaction_speed(20)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3431,16 +3425,3 @@ struct path paths[] = {
{ path13, 13, 0 },
{ NULL, 0, 0 },
};
src/files/setup/setupeld.c
+1 -9
View File
@@ -818,8 +818,6 @@ u8 func1002_intro[] = {
\
label(0x06)
wait_until(205, 0xab)
speak(CHR_BOND, L_ELD_039, MP3_03FF, CHANNEL_4, COLOR_09_BLUE) // "Agent Dark Mission Log, 1846 hours. Last night we ..."
@@ -2454,8 +2452,6 @@ u8 func1014_give_keycard[] = {
goto_next(0x09) \
label(0x2d)
give_keycard_if_alive(CHR_BASEMENT1)
give_keycard_if_alive(CHR_BASEMENT2)
give_keycard_if_alive(CHR_BASEMENT3)
@@ -2504,7 +2500,7 @@ u8 func1015_check_computers_destroyed[] = {
};
#define init_guard(accuracy, reaction, health, recovery) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(accuracy) \
set_reaction_speed(reaction) \
set_chr_maxdamage(CHR_SELF, health) \
@@ -2512,8 +2508,6 @@ u8 func1015_check_computers_destroyed[] = {
set_recovery_speed(recovery) \
set_shield(0)
u8 func040a_enable_sniper[] = {
init_guard(13, 15, 10, 15)
set_ailist(CHR_SELF, AILIST_SNIPER)
@@ -3000,8 +2994,6 @@ u8 func101f_check_one_basement_guard_remaining[] = {
add_morale(1) \
label(0x06)
beginloop(0x04)
set_morale(0)
src/files/setup/setupimp.c
+6 -24
View File
@@ -615,10 +615,8 @@ u8 func1400_setup_counterop[] = {
yield \
endloop(0x04)
#define initclone_logic(templatechr, clonefunc) \
set_chr_dodge_rating(2, 0x00) \
set_chr_dodge_rating(2, 0) \
set_accuracy(20) \
set_reaction_speed(70) \
set_chr_maxdamage(CHR_SELF, 40) \
@@ -635,8 +633,6 @@ u8 func1400_setup_counterop[] = {
rebuild_squadrons \
set_ailist(CHR_SELF, clonefunc)
// Spawn clones in autogun hall dead end room
u8 func0401_spawner1[] = {
spawner_logic(AILIST_INIT_CLONE1, AILIST_CLONE1)
@@ -848,8 +844,6 @@ u8 func1005_check_safeinfo_destroyed[] = {
show_hudmsg(CHR_BOND, 0x2222) /* "Critical mission object has been destroyed." */ \
set_stage_flag(STAGEFLAG_AUTOGUN_SWITCH_DESTROYED)
u8 func1007_autogun_switch1[] = {
autogun_switch_logic(OBJ_AUTOGUN_SWITCH1, OBJ_AUTOGUN1, STAGEFLAG_AUTOGUN1_ACTIVE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -922,8 +916,6 @@ u8 func0c01_outro[] = {
endloop(loopid) \
label(0x08)
wait_until(86, 0x73)
play_sound(SFX_0161, CHANNEL_10)
@@ -1443,8 +1435,6 @@ u8 func1002_intro[] = {
endloop(loopid) \
label(0x08)
wait_until2(8, 0x62)
play_sound(SFX_SKEDAR_ROAR_052A, CHANNEL_10)
@@ -1928,8 +1918,6 @@ u8 func041f_holoclone[] = {
set_returnlist(CHR_SELF, GAILIST_UNALERTED) \
set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET)
u8 func0420_taker_holo1[] = {
set_self_chrflag(CHRCFLAG_00040000)
holo_taker_logic(CHR_HOLOCLONE1)
@@ -1955,7 +1943,7 @@ u8 func0422_taker_holo3[] = {
};
u8 func0423_init_shock[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(20)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2690,8 +2678,6 @@ u8 func1014_carrington_messages[] = {
if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0xd9) \
label(0x06)
label(0x2e)
yield
label(0x08)
@@ -3042,10 +3028,8 @@ u8 func1015_firingrange_pc[] = {
yield \
endloop(0x04)
#define inittopclone_logic(templatechr, clonefunc) \
set_chr_dodge_rating(2, 0x00) \
set_chr_dodge_rating(2, 0) \
set_accuracy(20) \
set_reaction_speed(70) \
set_chr_maxdamage(CHR_SELF, 40) \
@@ -3061,8 +3045,6 @@ u8 func1015_firingrange_pc[] = {
rebuild_squadrons \
set_ailist(CHR_SELF, clonefunc)
// Spawner at top of ramp at start
u8 func040a_spawner4[] = {
topspawner_logic(AILIST_INIT_CLONE4, AILIST_CLONE4)
@@ -3410,7 +3392,7 @@ u8 unregistered_function1[] = {
};
u8 func043b_init_blonde[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(20)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3423,7 +3405,7 @@ u8 func043b_init_blonde[] = {
};
u8 func043c_init_cisolder[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(20)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3435,7 +3417,7 @@ u8 func043c_init_cisolder[] = {
};
u8 func043d_unused[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(30)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
src/files/setup/setuplee.c
-4
View File
@@ -1775,8 +1775,6 @@ u8 func1009_keep_door_open_in_intro[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_RELATED_TO_SPAWNING)
u8 func0401_start_path00[] = {
init_path(0)
endlist
@@ -2715,8 +2713,6 @@ u8 func1003_intro[] = {
endloop(loopid) \
label(0x06)
wait_until(60, LABEL_9A)
play_sound(SFX_0171, CHANNEL_10)
src/files/setup/setuplip.c
+18 -37
View File
@@ -1384,7 +1384,7 @@ u8 func1006_check_lab_accessed[] = {
};
#define init_path(accuracy, health, recovery, pathid) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(accuracy) \
set_reaction_speed(35) \
set_chr_maxdamage(CHR_SELF, health) \
@@ -1395,8 +1395,6 @@ u8 func1006_check_lab_accessed[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED_0004)
u8 func0401_start_path00[] = {
init_path(8, 50, 35, 0x00)
endlist
@@ -2783,7 +2781,7 @@ u8 func041d_unused_041d[] = {
* @unused
*/
u8 func041e_unused_041e[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(35)
set_chr_maxdamage(CHR_SELF, 80)
@@ -3471,8 +3469,6 @@ u8 func1018_disable_chambers[] = {
set_object_flag(chamber, OBJFLAG_DEACTIVATED) \
endloop(0x04)
/**
* This chamber has the alien in it.
*/
@@ -3942,8 +3938,6 @@ u8 func0c01_outro[] = {
endloop(loopid) \
label(0x06)
wait_until(315, LABEL_73)
open_door(0x30)
open_door(0x31)
@@ -4275,7 +4269,7 @@ u8 func1025_toggle_guards[] = {
};
u8 func0429_spawn_while_xraying[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(8)
set_reaction_speed(35)
set_chr_maxdamage(CHR_SELF, 50)
@@ -4358,7 +4352,7 @@ u8 func042b_xray_clone[] = {
};
u8 func042c_dragon_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(8)
set_reaction_speed(35)
set_chr_maxdamage(CHR_SELF, 50)
@@ -4370,7 +4364,7 @@ u8 func042c_dragon_guard[] = {
};
u8 func042d_superdragon_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(35)
set_chr_maxdamage(CHR_SELF, 80)
@@ -4382,7 +4376,7 @@ u8 func042d_superdragon_guard[] = {
};
u8 func042e_biotech_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(18)
set_reaction_speed(35)
set_chr_maxdamage(CHR_SELF, 80)
@@ -4394,7 +4388,7 @@ u8 func042e_biotech_guard[] = {
};
u8 func042e_biotech_guard_alerted[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(18)
set_reaction_speed(35)
set_chr_maxdamage(CHR_SELF, 80)
@@ -5092,33 +5086,20 @@ struct ailist ailists[] = {
};
struct path paths[] = {
{ path00, 0, 0 },
{ path01, 1, 0 },
{ path02, 2, 0 },
{ path03, 3, 0 },
{ path04, 4, 0 },
{ path05, 5, 0 },
{ path06, 6, 0 },
{ path07, 7, 0 },
{ path08, 8, 0 },
{ path09, 9, 0 },
{ path00, 0, 0 },
{ path01, 1, 0 },
{ path02, 2, 0 },
{ path03, 3, 0 },
{ path04, 4, 0 },
{ path05, 5, 0 },
{ path06, 6, 0 },
{ path07, 7, 0 },
{ path08, 8, 0 },
{ path09, 9, 0 },
{ path10, 10, 0 },
{ path11, 11, 0 },
{ path12, 12, 0 },
{ path13, 13, 0 },
{ path14, 14, 0 },
{ NULL, 0, 0 },
{ NULL, 0, 0 },
};
src/files/setup/setuplue.c
+8 -34
View File
@@ -880,7 +880,7 @@ u8 func0426_8420[] = {
};
#define init_path(pathid) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(6) \
set_reaction_speed(50) \
set_chr_maxdamage(CHR_SELF, 40) \
@@ -891,8 +891,6 @@ u8 func0426_8420[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED_0004)
u8 func0401_start_path00[] = {
init_path(0)
endlist
@@ -1093,8 +1091,6 @@ u8 func1400_give_bugs[] = {
show_hudmsg(chr, 0x2c1b) /* "Communications bug placed incorrectly." */ \
set_ailist(CHR_SELF, GAILIST_IDLE)
/**
* @unused
*/
@@ -1429,7 +1425,7 @@ u8 func100b_final_hangar[] = {
};
u8 func0411_init_hangar_guard1[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(8)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1451,7 +1447,7 @@ u8 func0411_init_hangar_guard1[] = {
};
u8 func0412_init_hangar_guard2[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(8)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1473,7 +1469,7 @@ u8 func0412_init_hangar_guard2[] = {
};
u8 func0413_init_hangar_guard3[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(8)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1495,7 +1491,7 @@ u8 func0413_init_hangar_guard3[] = {
};
u8 func0414_init_hangar_guard4[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(8)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1852,8 +1848,6 @@ u8 func040e_outro[] = {
endloop(loopid) \
label(0x06)
wait_until(1, 0x60)
speak(CHR_P1P2, L_LUE_067, MP3_0421, CHANNEL_5, COLOR_07_RED) // "Agent Dark! Over here!"
@@ -2688,7 +2682,7 @@ u8 func1018_unhide_guards[] = {
};
u8 func0419_clone_spawner[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(8)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2850,16 +2844,14 @@ u8 func040f_spawned_guard[] = {
set_shield(0) \
set_ailist(CHR_SELF, function)
u8 func041d_trooper_unalerted[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
init_guard(6, 50, 0, 0, GAILIST_UNALERTED)
endlist
};
u8 func041f_trooper_alerted[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
init_guard(6, 50, 0, 0, GAILIST_ALERTED)
endlist
};
@@ -3199,8 +3191,6 @@ u8 func0423_a5e8[] = {
disable_object(laser) \
set_ailist(CHR_SELF, AILIST_ACTIVATE_LASERS)
u8 func1026_check_laser1_broken[] = {
watch_for_laser_broken(0x44, 0x45, 0x1e)
endlist
@@ -3438,19 +3428,3 @@ struct ailist ailists[] = {
{ func142f_setup_environment, 0x142f },
{ NULL, 0 },
};
src/files/setup/setupmp10.c
-2
View File
@@ -39,5 +39,3 @@ struct path paths[] = {
struct ailist ailists[] = {
{ NULL, 0 },
};
src/files/setup/setupold.c
-2
View File
@@ -167,5 +167,3 @@ struct ailist ailists[] = {
{ func0c00_017c, 0x0c00 },
{ NULL, 0 },
};
src/files/setup/setuppam.c
+12 -31
View File
@@ -1527,8 +1527,6 @@ u8 func0c01_midcutscene[] = {
endloop(loopid) \
label(0x06)
#define wait_until_with_images(time, loopid, image1, image2) \
beginloop(loopid) \
set_drcaroll_images(CHR_DRCAROLL, image1, image2) \
@@ -1537,8 +1535,6 @@ u8 func0c01_midcutscene[] = {
endloop(loopid) \
label(0x06)
wait_until(114, 0x63)
speak(CHR_BOND, L_PAM_035, MP3_046D, CHANNEL_10, COLOR_09_BLUE) // "Here goes. I just hope dataDyne haven't done anyth..."
@@ -2218,7 +2214,7 @@ u8 func1002_intro[] = {
};
u8 func042f_init_pelagic_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(20)
set_reaction_speed(65)
set_chr_maxdamage(CHR_SELF, 70)
@@ -3675,8 +3671,6 @@ u8 func041e_init_sa_megaweapon_miniskedar[] = {
set_stage_flag(stageflag) \
set_ailist(CHR_SELF, 0x0408)
u8 func1013_pa_doorcylinder1[] = {
set_lights_state(0x00a1, LIGHTOP_4, 0x00, 0xff, 0xb4)
set_lights_state(0x00a9, LIGHTOP_4, 0x00, 0xff, 0xb4)
@@ -3806,8 +3800,6 @@ u8 func0408_check_pa_earlydoorcylinders_destroyed[] = {
destroy_object(glass + 10) \
destroy_object(glass + 11)
u8 func1018_pa_door1[] = {
pa_cylinder(0x20, 0xa1)
set_stage_flag(STAGEFLAG_PA_MIDDOORCYLINDER_DESTROYED)
@@ -4132,7 +4124,7 @@ u8 func1021_c6c4[] = {
};
#define init_path(pathid, function) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(20) \
set_reaction_speed(65) \
set_chr_maxdamage(CHR_SELF, 70) \
@@ -4144,8 +4136,6 @@ u8 func1021_c6c4[] = {
start_patrol \
set_ailist(CHR_SELF, GAILIST_UNALERTED_0004)
u8 func0421_start_path02[] = {
init_path(2, 0x0421)
endlist
@@ -4444,7 +4434,7 @@ u8 func1028_enable_last_3_guards[] = {
};
u8 func042b_run_to_exit[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(40)
set_reaction_speed(65)
set_chr_maxdamage(CHR_SELF, 10)
@@ -4952,23 +4942,14 @@ struct ailist ailists[] = {
};
struct path paths[] = {
{ path02, 2, 0 },
{ path03, 3, 0 },
{ path04, 4, 0 },
{ path05, 5, 0 },
{ path06, 6, 0 },
{ path07, 7, 0 },
{ path08, 8, 0 },
{ path09, 9, 0 },
{ path02, 2, 0 },
{ path03, 3, 0 },
{ path04, 4, 0 },
{ path05, 5, 0 },
{ path06, 6, 0 },
{ path07, 7, 0 },
{ path08, 8, 0 },
{ path09, 9, 0 },
{ path10, 10, 0 },
{ NULL, 0, 0 },
{ NULL, 0, 0 },
};
src/files/setup/setuppete.c
+19 -35
View File
@@ -488,8 +488,6 @@ s32 path13[] = {
set_object_flag3(object, OBJFLAG3_00000010) \
object_do_animation(animation, object, 0x04, 0xffff)
#define chicago_wait_for_camera \
beginloop(0x05) \
if_camera_animating(/*goto*/ 0x03) \
@@ -499,8 +497,6 @@ s32 path13[] = {
goto_first(0x05) \
label(0x04)
u8 func0401_3ae8[] = {
set_stage_flag(STAGEFLAG_TRIGGER_INTRO)
if_controller_button_pressed(/*goto*/ 0x00)
@@ -1070,8 +1066,6 @@ u8 func040c_taxi[] = {
show_hudmsg(chr, 0x3218) /* "Tracer Bug placed incorrectly." */ \
set_ailist(CHR_SELF, GAILIST_IDLE)
u8 func1004_tracerbug_bond[] = {
tracerbug_logic(CHR_BOND, CHR_BOND)
endlist
@@ -1733,7 +1727,7 @@ u8 func0413_bugspotter[] = {
};
#define init_patroller(pathid) \
set_chr_dodge_rating(2, 0x0a) \
set_chr_dodge_rating(2, 10) \
set_accuracy(4) \
set_reaction_speed(30) \
set_chr_maxdamage(CHR_SELF, 40) \
@@ -1747,8 +1741,6 @@ u8 func0413_bugspotter[] = {
beginloop(0x04) \
endloop(0x04)
u8 func0414_start_path07[] = {
init_patroller(0x07)
endlist
@@ -1916,8 +1908,6 @@ u8 func041d_fbi[] = {
show_hudmsg(CHR_BOND, 0x321d) /* "Mission failed - unacceptable civilian casualties." */ \
set_ailist(CHR_SELF, GAILIST_IDLE)
u8 func1009_check_cia1_dead[] = {
check_cia_dead(CHR_CIA1)
endlist
@@ -2092,7 +2082,7 @@ u8 func041a_robot[] = {
u8 func041e_sealer1[] = {
#define LABEL_ALERTED 0x18
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(4)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2283,8 +2273,6 @@ u8 func100d_spawn_alarm_responders[] = {
try_spawn_chr_at_pad(BODY_G5_SWAT_GUARD, HEAD_RANDOM, pad, AILIST_ALARM_RESPONDER, SPAWNFLAG_00000200, /*goto*/ 0x04) \
label(0x04)
label(0x07)
unlock_door(0x14, 0x04)
restart_timer
@@ -2363,7 +2351,7 @@ u8 func100d_spawn_alarm_responders[] = {
u8 func041f_alarm_responder[] = {
set_self_flag_bankx(CHRFLAG1_NOIDLEANIMS, BANK_1)
set_self_flag_bankx(CHRFLAG0_CANLOSEGUN, BANK_0)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(14)
set_reaction_speed(20)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2560,8 +2548,6 @@ u8 func040a_intro_sfx[] = {
endloop(loopid) \
label(0x04)
wait_until(30, 0x55)
speak(CHR_BOND, L_PETE_068, MP3_0408, CHANNEL_7, COLOR_05_GREEN) // "We suspect the G5 Corporation is just a front for ..."
@@ -2720,8 +2706,6 @@ u8 func040b_outro[] = {
endloop(loopid) \
label(0x04)
func0c01_wait_until(30, 0x2d)
play_sound(SFX_0161, CHANNEL_7)
@@ -2904,7 +2888,7 @@ u8 func1019_setup_topstairs_death_animation[] = {
};
u8 func040e_6064[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(4)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2917,7 +2901,7 @@ u8 func040e_6064[] = {
u8 func040f_6088[] = {
if_difficulty_lt(DIFF_SA, /*goto*/ 0x03)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(20)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2926,7 +2910,7 @@ u8 func040f_6088[] = {
set_shield(0)
set_ailist(CHR_SELF, GAILIST_UNALERTED)
label(0x03)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(4)
set_reaction_speed(30)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2938,7 +2922,7 @@ u8 func040f_6088[] = {
};
u8 func0410_60d0[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(14)
set_reaction_speed(20)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2951,7 +2935,7 @@ u8 func0410_60d0[] = {
u8 func0411_60f4[] = {
set_self_chrflag(CHRCFLAG_FORCEAUTOAIM)
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(14)
set_reaction_speed(20)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3349,19 +3333,19 @@ struct ailist ailists[] = {
};
struct path paths[] = {
{ path00, 0, 0 },
{ path01, 1, 0 },
{ path02, 2, 0 },
{ path03, 3, 0 },
{ path04, 4, 0 },
{ path05, 5, 0 },
{ path06, 6, 0 },
{ path07, 7, 0 },
{ path08, 8, 0 },
{ path09, 9, 0 },
{ path00, 0, 0 },
{ path01, 1, 0 },
{ path02, 2, 0 },
{ path03, 3, 0 },
{ path04, 4, 0 },
{ path05, 5, 0 },
{ path06, 6, 0 },
{ path07, 7, 0 },
{ path08, 8, 0 },
{ path09, 9, 0 },
{ path10, 10, 0 },
{ path11, 11, 0 },
{ path12, 12, 0 },
{ path13, 13, 0 },
{ NULL, 0, 0 },
{ NULL, 0, 0 },
};
src/files/setup/setuprit.c
+12 -20
View File
@@ -802,8 +802,6 @@ u8 func1006_hijack[] = {
set_chr_hiddenflag(chr, CHRHFLAG_00400000) \
yield
enable_stripes_chr(0x1d, AILIST_REINIT_STRIPES)
enable_stripes_chr(0x1e, AILIST_REINIT_STRIPES)
enable_stripes_chr(0x1f, AILIST_REINIT_STRIPES)
@@ -981,8 +979,6 @@ u8 unregistered_function1[] = {
set_stage_flag(STAGEFLAG_BOTH_MINES_WASTED) \
set_ailist(CHR_SELF, GAILIST_IDLE)
u8 func1008_check_mine_wasted_bond[] = {
check_mine_wasted(CHR_BOND, CHR_TARGET, STAGEFLAG_BOND_MINE_WASTED, STAGEFLAG_COOP_MINE_WASTED)
endlist
@@ -1698,7 +1694,7 @@ u8 func100c_cockpit_stripes[] = {
set_chr_team(CHR_SELF, TEAM_04)
rebuild_teams
rebuild_squadrons
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
@@ -1737,7 +1733,7 @@ u8 func040f_taker1[] = {
rebuild_teams
rebuild_squadrons
set_self_chrflag(CHRCFLAG_LOSEXTRAHEIGHT)
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
add_health_or_armor(0)
@@ -1753,7 +1749,7 @@ u8 func0410_taker2[] = {
rebuild_teams
rebuild_squadrons
set_self_chrflag(CHRCFLAG_LOSEXTRAHEIGHT)
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
add_health_or_armor(0)
@@ -2004,7 +2000,7 @@ u8 func0412_sitting_guy[] = {
};
u8 func0426_start_path00[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2018,7 +2014,7 @@ u8 func0426_start_path00[] = {
};
u8 func0427_start_path01[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2071,8 +2067,6 @@ u8 func1002_intro[] = {
endloop(loopid) \
label(0x06)
wait_until(140, 0x94)
wait_until(180, 0x60)
@@ -2512,7 +2506,7 @@ u8 func0415_cloner1[] = {
};
u8 func0416_init_clone1[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
@@ -2608,7 +2602,7 @@ u8 func0418_cloner2[] = {
};
u8 func0419_init_clone2[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
@@ -2700,7 +2694,7 @@ u8 func041b_cloner3[] = {
};
u8 func041c_init_clone3[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
@@ -2732,7 +2726,7 @@ u8 func041f_init_blonde[] = {
set_chr_team(CHR_SELF, TEAM_04)
rebuild_teams
rebuild_squadrons
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(24)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
@@ -3128,7 +3122,7 @@ u8 func042a_init_neutral[] = {
yield
yield
yield
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(70)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3142,7 +3136,7 @@ u8 func042a_init_neutral[] = {
};
u8 func042b_reinit_stripes[] = {
set_chr_dodge_rating(2, 0x00)
set_chr_dodge_rating(2, 0)
set_accuracy(14)
set_reaction_speed(50)
set_chr_maxdamage(CHR_SELF, 60)
@@ -3515,8 +3509,6 @@ u8 func0423_outro[] = {
endloop(loopid) \
label(0x06)
outro_wait_until(426, 0x77)
speak(CHR_BOND, L_RIT_080, MP3_0453, CHANNEL_7, COLOR_06_WHITE) // "Piece of cake, Joanna. Watch this!"
@@ -4207,5 +4199,5 @@ struct path paths[] = {
{ path00, 0, 0 },
{ path01, 1, 0 },
{ path02, 2, 0 },
{ NULL, 0, 0 },
{ NULL, 0, 0 },
};
src/files/setup/setupsev.c
-13
View File
@@ -1560,8 +1560,6 @@ u8 func1002_intro[] = {
\
label(0x06)
wait_until(300, 0x76)
play_sound(SFX_0161, CHANNEL_7)
@@ -1975,14 +1973,3 @@ struct ailist ailists[] = {
{ func041b_outro, 0x0c01 },
{ NULL, 0 },
};
src/files/setup/setupsho.c
-23
View File
@@ -1000,8 +1000,6 @@ u8 func1003_remove_random_skedar[] = {
remove_chr(chr2) \
label(0x06)
remove_random(0x05, 0x06)
remove_random(0x07, 0x08)
remove_random(0x0b, 0x0c)
@@ -1927,8 +1925,6 @@ u8 func100e_wake_skedar_army[] = {
endloop(loopid) \
label(0x2d)
enable_army_skedar(0x2e, 0x08)
enable_army_skedar(0x31, 0x09)
enable_army_skedar(0x2c, 0x0b)
@@ -2491,8 +2487,6 @@ u8 func100f_spikes_vulnerability[] = {
set_object_flag2(shadow, OBJFLAG2_INVISIBLE) \
unset_object_flag2(noshadow, OBJFLAG2_INVISIBLE)
u8 func1010_spike_ml[] = {
wait_for_spike_destroyed(OBJ_SPIKE_ML, OBJ_SPIKE_SHAD_ML, OBJ_SPIKE_NOSHAD_ML)
set_ailist(CHR_SELF, AILIST_UPDATE_SPIKE_STAGEFLAGS)
@@ -3424,8 +3418,6 @@ u8 func0414_outro_sounds[] = {
endloop(loopid) \
label(0x06)
#define outro_wait_until(time, loopid) \
beginloop(loopid) \
if_controller_button_pressed(/*goto*/ 0x86) \
@@ -3433,14 +3425,11 @@ u8 func0414_outro_sounds[] = {
endloop(loopid) \
label(0x06)
label(0x2d)
unset_chr_chrflag(CHR_BOND, CHRCFLAG_KILLCOUNTABLE)
unset_chr_chrflag(CHR_COOP, CHRCFLAG_KILLCOUNTABLE)
restart_timer
outro_wait_until_with_stageflag(40, 0xd5)
play_sound(SFX_0067, CHANNEL_10)
@@ -4036,15 +4025,3 @@ struct ailist ailists[] = {
struct path paths[] = {
{ NULL, 0, 0 },
};
src/files/setup/setupstat.c
-10
View File
@@ -1246,8 +1246,6 @@ u8 func100f_blow_mines[] = {
\
label(0x2d)
wait(0x94)
destroy_object(OBJ_MINE6)
wait(0x95)
@@ -1428,11 +1426,3 @@ struct ailist ailists[] = {
{ func040b_outro, 0x0c01 },
{ NULL, 0 },
};
src/files/setup/setuptra.c
+7 -22
View File
@@ -1574,7 +1574,7 @@ u8 func1008_spawngroup1[] = {
};
u8 func1008_spawngroup1_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(40)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1649,7 +1649,7 @@ u8 func1013_spawngroup2[] = {
};
u8 func1013_spawngroup2_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(40)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1768,7 +1768,7 @@ u8 func1014_spawngroup3[] = {
};
u8 func1014_spawngroup3_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(40)
set_chr_maxdamage(CHR_SELF, 40)
@@ -1852,7 +1852,7 @@ u8 func1015_spawngroup4[] = {
* @unused
*/
u8 func1015_spawngroup4_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(40)
set_chr_maxdamage(CHR_SELF, 40)
@@ -2577,8 +2577,6 @@ u8 func1002_intro[] = {
endloop(loopid) \
label(0x06)
wait_until(2, 0xc5)
speak(CHR_BOND, L_TRA_081, SFX_81BA, CHANNEL_7, COLOR_02_WHITE) // "What the hell do you think you're doing? This is s..."
@@ -3284,7 +3282,7 @@ u8 func1021_jo_escaping[] = {
* time.
*/
u8 func0416_spawn_during_follow[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(40)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3355,7 +3353,7 @@ u8 func0418_follower_clone[] = {
};
u8 func0419_init_biotech[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(20)
set_reaction_speed(40)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3368,7 +3366,7 @@ u8 func0419_init_biotech[] = {
};
u8 func041a_init_superdragon_guard[] = {
set_chr_dodge_rating(2, 0x0a)
set_chr_dodge_rating(2, 10)
set_accuracy(10)
set_reaction_speed(40)
set_chr_maxdamage(CHR_SELF, 40)
@@ -3562,8 +3560,6 @@ u8 func1024_wall_immune_to_explosives[] = {
\
set_ailist(CHR_SELF, GAILIST_IDLE)
u8 unregistered_function2[] = {
set_object_flag(OBJ_MEDPACK_GLASS, OBJFLAG_INVINCIBLE)
glass_explosives_thing(0x23)
@@ -3972,14 +3968,3 @@ struct ailist ailists[] = {
struct path paths[] = {
{ NULL, 0, 0 },
};
src/files/setup/setupwax.c
-2
View File
@@ -2000,8 +2000,6 @@ u8 func0416_intro[] = {
\
label(0x06)
wait_until(106, 0xb1)
play_sound(SFX_0162, CHANNEL_10)
play_sound(SFX_047A, CHANNEL_10)
src/game/chraction.c
+2474 -2480
View File
File diff suppressed because it is too large Load Diff
src/game/chraicommands.c
+1 -1
View File
@@ -6547,7 +6547,7 @@ glabel var7f1a9d4c
// if (chr && chr->model
// && !chrIsDead(chr)
// && chr->actiontype != ACT_DEAD
// && chr->alertness > 100 // @bug? I don't think this goes higher than 100
// && chr->alertness > 100
// && g_Vars.chrdata->squadron == chr->squadron
// && g_Vars.chrdata->chrnum != chr->chrnum
// && chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum) < 3500) {
src/game/chrmgr.c
-1
View File
@@ -34,7 +34,6 @@ void chrmgrReset(void)
var80062960 = mempAlloc(ALIGN16(15 * sizeof(struct var80062960)), MEMPOOL_STAGE);
for (i = 0; i < 20; i++) {
// @bug? ALIGN64 should surely be applied before mempAlloc...?
var8009ccc0[i] = (void *)ALIGN64(mempAlloc(0x240, MEMPOOL_STAGE));
}
src/game/gailists.c
+2 -2
View File
@@ -5740,7 +5740,7 @@ u8 func0025_pointless[] = {
};
/**
* @ailist GAILIST_POINTLESS
* @ailist GAILIST_INIT_PSYCHOSIS
*
* Handle a chr being shot with the psychosis gun.
*/
@@ -6119,7 +6119,7 @@ struct ailist g_GlobalAilists[] = {
{ func0018_do_bored_animation, GAILIST_DO_BORED_ANIMATION },
{ func0019_do_sitting_animation, GAILIST_DO_SITTING_ANIMATION },
{ func0000_idle_0009, GAILIST_IDLE_0009 },
{ func001a_patroller_dis_talking, GAILIST_PATROLLER_DIS_TALKING },
{ func001a_patroller_dis_talking, GAILIST_PATROLLER_DIS_TALKING },
{ func000f_hand_combat, GAILIST_HAND_COMBAT },
{ func0010_civilian_say_comment, GAILIST_CIVILIAN_SAY_COMMENT },
{ func0011_flee_from_grenade, GAILIST_FLEE_FROM_GRENADE },
src/game/hudmsg.c
+1 -1
View File
@@ -1045,7 +1045,7 @@ void hudmsgCreateAsSubtitle(char *srctext, s32 type, u8 colourindex, s32 audioch
}
}
// Copy the the character from srctext to msg, except:
// Copy the character from srctext to msg, except:
// - if it's a space at the start of the string
// - if it's a consecutive space
// - if it's a line break (sometimes copy a space instead)
src/game/pak.c
+1 -1
View File
@@ -7180,7 +7180,7 @@ glabel pakConvertFromGbcImage
*
* The GBC's format is 128x112 pixels at 2 bits per pixel. The bits are not
* linear; the two bits for each pixel are in neighbouring bytes using the same
* bit index. It also appears that the the GBC format is column major.
* bit index. It also appears that the GBC format is column major.
*/
//void pakConvertFromGbcImage(u8 *src, u8 *dst)
//{
src/game/propobj.c
+2 -2
View File
@@ -45033,8 +45033,8 @@ glabel var7f1aa698
// struct coord sp8c;
//
// // I guess the timer is set explicitly to 2 when the chopper is destroyed,
// // otherwise there's no guarantee that that the timer will land on this
// // value when ticking down normally. So this code is run once when entering
// // otherwise there's no guarantee that the timer will land on this value
// // when ticking down normally. So this code is run once when entering
// // fall mode.
// if (chopper->timer60 == 2) {
// // Figure out what direction to fall in
tools/mkrom/main.c
+1 -1
View File
@@ -7,7 +7,7 @@ struct state state;
/**
* mkrom - do ROM finalisation steps
*
* mkrom <romfile> <mapfile> <piracychecks> <zipmagic> <outfile>
* mkrom <romfile> <mapfile> <piracychecks> <zipmagic> <copylen> <outfile>
*
* <romfile>
* This is the path to the stage1 binary. This file is similar to the final ROM,