mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-09-09 03:30:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Defection programmer

Browse Source
This commit is contained in:
Ryan Dwyer
2022-11-06 21:36:29 +10:00
parent 77c07dd6df
commit ba0eb5b656
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ailists/setupame.c
+4 -18
View File
@@ -1593,17 +1593,10 @@ u8 func0414_programmer[] = {
// Wait until Jo or Velvet near his office
beginloop(0x91)
#if VERSION >= VERSION_NTSC_1_0
set_target_chr(CHR_BOND)
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 80, 1240, /*goto*/ 0x06)
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_007C, 800, /*goto*/ 0x06)
set_target_chr(CHR_COOP)
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 80, 1240, /*goto*/ 0x06)
#else
set_target_chr(CHR_BOND)
if_chr_distance_to_pad_lt(CHR_TARGET, 800, 124, /*goto*/ 0x06)
set_target_chr(CHR_COOP)
if_chr_distance_to_pad_lt(CHR_TARGET, 800, 124, /*goto*/ 0x06)
#endif
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_007C, 800, /*goto*/ 0x06)
endloop(0x91)
// Phone ringing
@@ -1616,17 +1609,10 @@ u8 func0414_programmer[] = {
// Wait until Jo or Velvet is close to his door
beginloop(0x92)
#if VERSION >= VERSION_NTSC_1_0
set_target_chr(CHR_BOND)
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_0014, 1240, /*goto*/ 0x06)
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_007C, 200, /*goto*/ 0x06)
set_target_chr(CHR_COOP)
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_0014, 1240, /*goto*/ 0x06)
#else
set_target_chr(CHR_BOND)
if_chr_distance_to_pad_lt(CHR_TARGET, 200, 124, /*goto*/ 0x06)
set_target_chr(CHR_COOP)
if_chr_distance_to_pad_lt(CHR_TARGET, 200, 124, /*goto*/ 0x06)
#endif
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_007C, 200, /*goto*/ 0x06)
endloop(0x92)
label(0x06)
src/include/commands.h
+1 -1
View File
@@ -3495,8 +3495,8 @@
#define if_chr_same_floor_distance_to_pad_lt(chr, pad, distance, label) \
mkshort(0x01df), \
chr, \
mkshort(pad), \
mkshort(distance / 10), \
mkshort(pad), \
label,
/**