mirror of
https://gitlab.com/ryandwyer/perfect-dark
synced 2026-08-04 08:58:50 -04:00
Identify aiIfChrSameFloorDistanceToPadLessThan
This commit is contained in:
@@ -1582,9 +1582,9 @@ u8 func0414_programmer[] = {
|
||||
// Wait until Jo or Velvet near his office
|
||||
beginloop(0x91)
|
||||
set_target_chr(CHR_BOND)
|
||||
if_chr_distance_to_pad_lt2(CHR_TARGET, 0x0050, 1240, /*goto*/ 0x06)
|
||||
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 0x0050, 1240, /*goto*/ 0x06)
|
||||
set_target_chr(CHR_COOP)
|
||||
if_chr_distance_to_pad_lt2(CHR_TARGET, 0x0050, 1240, /*goto*/ 0x06)
|
||||
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 0x0050, 1240, /*goto*/ 0x06)
|
||||
endloop(0x91)
|
||||
|
||||
// Phone ringing
|
||||
@@ -1594,9 +1594,9 @@ u8 func0414_programmer[] = {
|
||||
// Wait until Jo or Velvet is close to his door
|
||||
beginloop(0x92)
|
||||
set_target_chr(CHR_BOND)
|
||||
if_chr_distance_to_pad_lt2(CHR_TARGET, 0x0014, 1240, /*goto*/ 0x06)
|
||||
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 0x0014, 1240, /*goto*/ 0x06)
|
||||
set_target_chr(CHR_COOP)
|
||||
if_chr_distance_to_pad_lt2(CHR_TARGET, 0x0014, 1240, /*goto*/ 0x06)
|
||||
if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 0x0014, 1240, /*goto*/ 0x06)
|
||||
endloop(0x92)
|
||||
|
||||
label(0x06)
|
||||
|
||||
@@ -2189,7 +2189,7 @@ glabel aiIfChrDistanceToPadLessThan
|
||||
* @cmd 01df
|
||||
*/
|
||||
GLOBAL_ASM(
|
||||
glabel ai01df
|
||||
glabel aiIfChrSameFloorDistanceToPadLessThan
|
||||
/* f050c54: 27bdffd0 */ addiu $sp,$sp,-48
|
||||
/* f050c58: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f050c5c: 3c10800a */ lui $s0,0x800a
|
||||
|
||||
@@ -1913,7 +1913,7 @@
|
||||
u1, \
|
||||
label,
|
||||
|
||||
#define if_chr_distance_to_pad_lt2(chr, pad, distance, label) \
|
||||
#define if_chr_same_floor_distance_to_pad_lt(chr, pad, distance, label) \
|
||||
mkshort(0x01df), \
|
||||
chr, \
|
||||
mkshort(pad), \
|
||||
|
||||
@@ -442,7 +442,7 @@
|
||||
/*0x01dc*/ bool aiRemoveWeaponFromInventory(void);
|
||||
/*0x01dd*/ bool ai01dd(void);
|
||||
/*0x01de*/ bool ai01de(void);
|
||||
/*0x01df*/ bool ai01df(void);
|
||||
/*0x01df*/ bool aiIfChrSameFloorDistanceToPadLessThan(void);
|
||||
/*0x01e0*/ bool ai01e0(void);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -14432,7 +14432,7 @@ bool (*g_CommandPointers[])(void) = {
|
||||
/*0x01dc*/ aiRemoveWeaponFromInventory,
|
||||
/*0x01dd*/ ai01dd,
|
||||
/*0x01de*/ ai01de,
|
||||
/*0x01df*/ ai01df,
|
||||
/*0x01df*/ aiIfChrSameFloorDistanceToPadLessThan,
|
||||
/*0x01e0*/ ai01e0,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user