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

Decompile chrIsTargetInFov and rename several AI commands relating to FOV direction checks

Browse Source
This commit is contained in:
Ryan Dwyer
2020-05-30 10:55:30 +10:00
parent ff94829911
commit 376ae2d7c7
24 changed files with 125 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/setup/setupame.c
+4 -4
View File
@@ -1279,7 +1279,7 @@ u8 func040f_cass[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x64)
beginloop(0x64)
if_jo_ccw_direction_lt(10, /*goto*/ 0x65)
if_target_in_fov_left(10, /*goto*/ 0x65)
if_timer_gt(90, /*goto*/ 0x65)
endloop(0x64)
@@ -1512,7 +1512,7 @@ u8 func0411_secretary[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x7f)
beginloop(0x7f)
if_jo_ccw_direction_lt(10, /*goto*/ 0x81)
if_target_in_fov_left(10, /*goto*/ 0x81)
if_timer_gt(120, /*goto*/ 0x81)
endloop(0x7f)
@@ -1703,7 +1703,7 @@ u8 func0414_programmer[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x9a)
beginloop(0x9a)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x9a)
@@ -1803,7 +1803,7 @@ u8 func0414_programmer[] = {
beginloop(0x9b)
if_stage_flag_eq(STAGEFLAG_TALKED_TO_PROGRAMMER, TRUE, /*goto*/ 0x06)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x9b)
src/files/setup/setupcave.c
+9 -9
View File
@@ -1232,7 +1232,7 @@ u8 func0407_stewardess[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x05)
beginloop(0x05)
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_timer_gt(60, /*goto*/ 0x02)
endloop(0x05)
@@ -1529,7 +1529,7 @@ u8 func0408_secretary[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x05)
beginloop(0x05)
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_timer_gt(60, /*goto*/ 0x02)
endloop(0x05)
@@ -2125,7 +2125,7 @@ u8 func0409_office1[] = {
reloop(0x0b)
label(0x31)
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_timer_gt(60, /*goto*/ 0x02)
endloop(0x0b)
@@ -2148,7 +2148,7 @@ u8 func0409_office1[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x05)
beginloop(0x05)
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_timer_gt(60, /*goto*/ 0x02)
endloop(0x05)
@@ -2243,7 +2243,7 @@ u8 func040a_office2[] = {
reloop(0x05)
label(0x31)
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_timer_gt(60, /*goto*/ 0x02)
endloop(0x05)
@@ -2508,8 +2508,8 @@ u8 func040f_nsa[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_jo_ccw_direction_gt(245, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_target_out_of_fov_left(245, /*goto*/ 0x02)
if_timer_gt(60, /*goto*/ 0x02)
endloop(0x09)
@@ -2746,7 +2746,7 @@ u8 func0414_officeworker[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x78)
beginloop(0x78)
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_timer_gt(40, /*goto*/ 0x02)
endloop(0x78)
@@ -3417,7 +3417,7 @@ u8 func0419_ba8c[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x08)
label(0x08)
yield
if_jo_ccw_direction_lt(10, /*goto*/ 0x02)
if_target_in_fov_left(10, /*goto*/ 0x02)
if_timer_gt(40, /*goto*/ 0x02)
goto_first(0x08)
src/files/setup/setupdam.c
+1 -1
View File
@@ -1580,7 +1580,7 @@ u8 func0411_labtech_alerted[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x0c)
beginloop(0x0c)
if_jo_ccw_direction_lt(10, /*goto*/ 0x04)
if_target_in_fov_left(10, /*goto*/ 0x04)
if_timer_gt(60, /*goto*/ 0x04)
endloop(0x0c)
src/files/setup/setupdepo.c
+1 -1
View File
@@ -2353,7 +2353,7 @@ u8 func0413_cloak1_guard[] = {
chr_toggle_p1p2(CHR_SELF)
set_target_chr(CHR_P1P2)
if_distance_to_target_lt(400, /*goto*/ 0x06)
if_jo_front_direction_lt(30, /*goto*/ 0x06)
if_target_in_fov(30, /*goto*/ 0x06)
if_chr_in_view(/*goto*/ 0x06)
if_difficulty_lt(DIFF_SA, /*goto*/ 0x2c)
if_timer_gt(180, /*goto*/ 0x06)
src/files/setup/setupdish.c
+7 -7
View File
@@ -594,7 +594,7 @@ u8 func041e_colleague[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -2468,7 +2468,7 @@ u8 func0429_grimshaw_disguise[] = {
beginloop(0x09)
if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x0d)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -2659,7 +2659,7 @@ u8 func042a_carrington_cloak[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -5245,8 +5245,8 @@ u8 func0416_holo_guard_unarmed_alert2[] = {
label(0x06)
restart_timer
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
stop_chr
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
@@ -5254,8 +5254,8 @@ u8 func0416_holo_guard_unarmed_alert2[] = {
if_chr_dead(CHR_TARGET, /*goto*/ 0x57)
if_chr_knockedout(CHR_TARGET, /*goto*/ 0x57)
if_distance_to_target_gt(400, /*goto*/ 0x10)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
if_timer_gt(120, /*goto*/ 0x06)
endloop(0x09)
src/files/setup/setupear.c
+3 -3
View File
@@ -1027,7 +1027,7 @@ u8 func0404_scientist[] = {
endloop(0x09)
label(0x2f)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
goto_first(0x09)
@@ -1059,7 +1059,7 @@ u8 func0404_scientist[] = {
chr_do_animation(ANIM_SURRENDER_002E, 0, -1, 0x10, 0x10, CHR_SELF, 2)
beginloop(0x0b)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(90, /*goto*/ 0x06)
endloop(0x0b)
@@ -1211,7 +1211,7 @@ u8 func0406_nasty_scientist[] = {
reloop(0x09)
label(0x2f)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
src/files/setup/setuplee.c
+4 -4
View File
@@ -2336,8 +2336,8 @@ u8 func041a_bridgeclone[] = {
label(0x2e)
restart_timer
dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0,
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
stop_chr
try_face_entity(ENTITYTYPE_TARGET, 1, /*goto*/ 0x0b)
@@ -2346,8 +2346,8 @@ u8 func041a_bridgeclone[] = {
if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x10)
if_chr_dead(CHR_TARGET, /*goto*/ 0x10)
if_chr_knockedout(CHR_TARGET, /*goto*/ 0x10)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
if_timer_gt(15, /*goto*/ 0x06)
endloop(0x0b)
src/files/setup/setuplip.c
+7 -7
View File
@@ -1357,7 +1357,7 @@ u8 func0410_labtech_showers_sa_pa[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -1728,7 +1728,7 @@ u8 func0418_doorman[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -1961,7 +1961,7 @@ u8 func041a_labtech_harrysmate[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -2331,7 +2331,7 @@ u8 func0413_mechanic[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -2635,7 +2635,7 @@ u8 func041f_labtech_lights[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -2864,7 +2864,7 @@ u8 func0420_labtech_doors[] = {
beginloop(0x09)
if_saw_injury(0x00, /*goto*/ 0x89)
if_saw_death(0x00, /*goto*/ 0x89)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -3097,7 +3097,7 @@ u8 func0422_labtech_records[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
label(0x09)
yield
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
goto_first(0x09)
src/files/setup/setuplue.c
+1 -1
View File
@@ -1662,7 +1662,7 @@ u8 func0416_mechanic[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x0a)
beginloop(0x0a)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(30, /*goto*/ 0x06)
endloop(0x0a)
src/files/setup/setuppam.c
+3 -3
View File
@@ -3133,7 +3133,7 @@ u8 func041b_sniper_wait_for_detection[] = {
label(0x2e)
if_distance_to_target_lt(400, /*goto*/ 0x06)
if_jo_front_direction_lt(30, /*goto*/ 0x06)
if_target_in_fov(30, /*goto*/ 0x06)
if_chr_in_view(/*goto*/ 0x06)
if_saw_death(0x00, /*goto*/ 0x06)
if_alertness(100, OPERATOR_GREATER_THAN, /*goto*/ 0x06)
@@ -3474,8 +3474,8 @@ u8 func040f_miniskedar[] = {
reloop(0x0b)
label(0x2e)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
endloop(0x0b)
label(0x06)
src/files/setup/setuppete.c
+3 -3
View File
@@ -1440,7 +1440,7 @@ u8 func0412_cia[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x04)
if_target_in_fov_left(10, /*goto*/ 0x04)
if_timer_gt(40, /*goto*/ 0x04)
endloop(0x09)
@@ -1589,7 +1589,7 @@ u8 func0413_bugspotter[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x04)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x04)
if_target_in_fov_left(10, /*goto*/ 0x04)
if_timer_gt(40, /*goto*/ 0x04)
endloop(0x09)
@@ -1871,7 +1871,7 @@ u8 func041d_fbi[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x0d)
beginloop(0x0d)
if_jo_ccw_direction_lt(10, /*goto*/ 0x04)
if_target_in_fov_left(10, /*goto*/ 0x04)
if_timer_gt(40, /*goto*/ 0x04)
endloop(0x0d)
src/files/setup/setuprit.c
+4 -4
View File
@@ -1218,7 +1218,7 @@ u8 func0405_president_in_room[] = {
reloop(0x09)
label(0x2d)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -1249,7 +1249,7 @@ u8 func0405_president_in_room[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x78)
// In this loop the president will continue to turn to face the player
// because it lacks an if_jo_ccw_direction_lt check.
// because it lacks an if_target_in_fov_left check.
beginloop(0x78)
if_chr_in_room(CHR_TARGET, 0x00, 0x0055, /*goto*/ 0x2d)
if_chr_in_room(CHR_TARGET, 0x00, 0x0056, /*goto*/ 0x2d)
@@ -3242,7 +3242,7 @@ u8 func0407_steward[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
@@ -3298,7 +3298,7 @@ u8 func0407_stewardess[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
src/files/setup/setupsho.c
+10 -10
View File
@@ -610,8 +610,8 @@ u8 func0402_unarmed_skedar[] = {
label(0x2f)
restart_timer
dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0,
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
stop_chr
set_action(MA_FACING, TRUE)
try_face_entity(ENTITYTYPE_TARGET, 1, /*goto*/ 0x0c)
@@ -623,8 +623,8 @@ u8 func0402_unarmed_skedar[] = {
if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x10)
if_chr_dead(CHR_TARGET, /*goto*/ 0x10)
if_chr_knockedout(CHR_TARGET, /*goto*/ 0x10)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x0c)
@@ -809,8 +809,8 @@ u8 func0404_miniskedar[] = {
endloop(0x0c)
label(0x2d)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
goto_first(0x0c)
label(0x06)
@@ -2158,15 +2158,15 @@ u8 func040d_king_combat[] = {
set_chr_cloaked(CHR_SELF, FALSE, TRUE)
restart_timer
dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0,
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
stop_chr
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x09)
beginloop(0x09)
if_chr_death_animation_finished(CHR_P1P2, /*goto*/ 0x0b)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_jo_ccw_direction_gt(246, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_target_out_of_fov_left(246, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x09)
src/files/setup/setuptra.c
+1 -1
View File
@@ -1339,7 +1339,7 @@ u8 func0413_jonathan_hangar[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x46)
beginloop(0x46)
if_jo_ccw_direction_lt(10, /*goto*/ 0x06)
if_target_in_fov_left(10, /*goto*/ 0x06)
if_timer_gt(60, /*goto*/ 0x06)
endloop(0x46)
src/files/setup/setupwax.c
+2 -2
View File
@@ -1319,8 +1319,8 @@ u8 func0411_cass_in_office[] = {
try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x56)
beginloop(0x56)
if_jo_ccw_direction_lt(10, /*goto*/ 0x57)
if_jo_ccw_direction_gt(246, /*goto*/ 0x57)
if_target_in_fov_left(10, /*goto*/ 0x57)
if_target_out_of_fov_left(246, /*goto*/ 0x57)
endloop(0x56)
// Draw weapon