mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-19 05:22:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add comments where sound IDs are used and improve documentation for say_quip AI command

Browse Source
This commit is contained in:
Ryan Dwyer
2020-05-20 22:49:08 +10:00
parent ff0420aa3a
commit f6867e37df
28 changed files with 985 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/setup/setupame.c
+2 -2
View File
@@ -3774,7 +3774,7 @@ u8 func042f_surrendering_guard[] = {
// Be surprised
label(0x2c)
say_quip(CHR_BOND, 0x12, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) // "What the?!","Who the?!"
say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
chr_do_animation(ANIM_SURPRISED_0202, 0, -1, 0x00, 0x10, CHR_SELF, 2)
// Wait 1 second
@@ -3803,7 +3803,7 @@ u8 func042f_surrendering_guard[] = {
// Warn
label(0x57)
dprint 'W','A','R','N',' ','F','R','I','E','N','D','S','\n',0,
say_quip(CHR_BOND, 0x10, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00) // "Intruder alert!","We've got trouble","We've got problems"
say_quip(CHR_BOND, QUIP_WARNFRIENDS, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
increase_squadron_alertness(100)
// No chr in same group, or follow through from above
src/files/setup/setupark.c
+11 -11
View File
@@ -897,7 +897,7 @@ u8 func0406_general_combat[] = {
endloop(0x0b)
label(0x00)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -915,8 +915,8 @@ u8 func0406_general_combat[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x00)
if_num_times_shot_lt(1, /*goto*/ 0x00)
if_timer_lt(20, /*goto*/ 0x00)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x00)
if_chr_stopped(/*goto*/ 0x21)
@@ -993,11 +993,11 @@ u8 func0406_general_combat[] = {
if_self_flag_bankx_eq(CHRFLAG0_00000004, TRUE, BANK_0, /*goto*/ 0x20)
set_self_flag_bankx(CHRFLAG0_00000004, BANK_0)
if_stage_flag_eq(STAGEFLAG_FOYER_LIGHTS_RESTORED, TRUE, /*goto*/ 0x00)
say_quip(CHR_BOND, 0x1b, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SEARCHSUCCESS, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
goto_next(0x20)
label(0x00)
say_quip(CHR_BOND, 0x0b, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SEEPLAYER, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
label(0x20)
if_self_flag_bankx_eq(CHRFLAG0_00002000, TRUE, BANK_0, /*goto*/ 0x17)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x12)
@@ -1009,13 +1009,13 @@ u8 func0406_general_combat[] = {
label(0x13)
if_chr_injured_target(CHR_SELF, /*goto*/ 0x20)
say_quip(CHR_BOND, 0x16, 0x19, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x17, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_MISSEDPLAYER1, 0x19, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_MISSEDPLAYER2, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
goto_next(0x00)
label(0x20)
say_quip(CHR_BOND, 0x15, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x15, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
label(0x00)
goto_first(0x14)
@@ -1024,7 +1024,7 @@ u8 func0406_general_combat[] = {
if_self_flag_bankx_eq(CHRFLAG0_00000004, TRUE, BANK_0, /*goto*/ 0x1c)
set_self_flag_bankx(CHRFLAG0_00000004, BANK_0)
if_stage_flag_eq(STAGEFLAG_FOYER_LIGHTS_RESTORED, TRUE, /*goto*/ 0x1c)
say_quip(CHR_BOND, 0x12, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
beginloop(0x1c)
chr_toggle_p1p2(CHR_SELF)
@@ -1061,7 +1061,7 @@ u8 func0406_general_combat[] = {
label(0x17)
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0x16)
label(0x16)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x00)
goto_next(0x20)
label(0x00)
src/files/setup/setupazt.c
+1 -1
View File
@@ -1750,7 +1750,7 @@ u8 func041f_trent_shooting[] = {
label(0xa8)
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0xa7)
label(0xa7)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x0a)
goto_next(0x31)
src/files/setup/setupcave.c
+2 -2
View File
@@ -1163,8 +1163,8 @@ u8 func0407_stewardess[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x02)
if_num_times_shot_lt(1, /*goto*/ 0x02)
if_timer_lt(20, /*goto*/ 0x02)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x02)
if_chr_stopped(/*goto*/ 0x4c)
src/files/setup/setupdam.c
+3 -3
View File
@@ -1611,7 +1611,7 @@ u8 func0411_labtech_alerted[] = {
label(0x41)
increase_squadron_alertness(100)
say_quip(CHR_BOND, 0x10, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_WARNFRIENDS, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
label(0x42)
go_to_target_pad(SPEED_RUN)
@@ -1902,7 +1902,7 @@ u8 func0401_pilot[] = {
// Seen player
label(0x07)
say_quip(CHR_BOND, 0x08, 0xfe, 0x0a, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SURRENDER, 0xfe, 0x0a, 0xff, BANK_0, 0x00, 0x00)
label(0x04)
increase_squadron_alertness(100)
@@ -1943,7 +1943,7 @@ u8 func0401_pilot[] = {
// GPS disabled
label(0x04)
say_quip(CHR_BOND, 0x08, 0xfe, 0x0a, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SURRENDER, 0xfe, 0x0a, 0xff, BANK_0, 0x00, 0x00)
goto_first(0x0b)
label(0x07)
src/files/setup/setupdish.c
+6 -6
View File
@@ -5278,13 +5278,13 @@ u8 func0416_holo_guard_unarmed_alert2[] = {
label(0x06)
if_chr_injured_target(CHR_SELF, /*goto*/ 0x2f)
say_quip(CHR_BOND, 0x16, 0x19, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x17, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_MISSEDPLAYER1, 0x19, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_MISSEDPLAYER2, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
goto_next(0x06)
label(0x2f)
say_quip(CHR_BOND, 0x15, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x15, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0f)
set_stage_flag(STAGEFLAG_GENERAL_PURPOSE)
set_stage_flag(STAGEFLAG_HOLO_FAILED)
@@ -5621,8 +5621,8 @@ u8 func0419_holo_guard_armed_alert[] = {
label(0x06)
goto_first(0x8f)
say_quip(CHR_BOND, 0x15, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x15, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00)
label(0x2f)
if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d)
set_stage_flag(STAGEFLAG_GENERAL_PURPOSE)
src/files/setup/setupear.c
+1 -1
View File
@@ -2866,7 +2866,7 @@ u8 func0402_k7_guard[] = {
label(0x2f)
try_aim_and_shoot_thing2(0x0008, 0x0159, /*goto*/ 0x2f)
label(0x2f)
say_quip(CHR_BOND, 0x00, 0x32, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x32, 0x02, 0xff, BANK_0, 0x00, 0x00)
beginloop(0x08)
chr_toggle_p1p2(CHR_SELF)
src/files/setup/setupeld.c
+1 -1
View File
@@ -1531,7 +1531,7 @@ u8 func0402_taker[] = {
// Laptop gun equipped
label(0x0b)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
say_quip(CHR_BOND, 0x12, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
restart_timer
chr_do_animation(0x0202, 0, -1, 0x10, 0x0a, CHR_SELF, 2)
src/files/setup/setupimp.c
+2 -2
View File
@@ -1901,7 +1901,7 @@ u8 func041f_holoclone[] = {
yield \
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0xb9) \
label(0xb9) \
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00) \
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00) \
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x0a) \
\
beginloop(0x0a) \
@@ -2368,7 +2368,7 @@ u8 func0432_taker_attack[] = {
yield
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0xb9)
label(0xb9)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x0a)
beginloop(0x0a)
src/files/setup/setuplee.c
+3 -3
View File
@@ -2971,7 +2971,7 @@ u8 func0421_bridge_skedar[] = {
endloop(0x53)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -3018,7 +3018,7 @@ u8 func0421_bridge_skedar[] = {
set_view_distance(100)
if_self_flag_bankx_eq(CHRFLAG0_00000004, TRUE, BANK_0, /*goto*/ 0x2c)
set_self_flag_bankx(CHRFLAG0_00000004, BANK_0)
say_quip(CHR_BOND, 0x0b, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SEEPLAYER, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
label(0x2c)
goto_next(0xca)
@@ -3087,7 +3087,7 @@ u8 func0421_bridge_skedar[] = {
if_self_flag_bankx_eq(CHRFLAG0_00002000, FALSE, BANK_0, /*goto*/ 0x60)
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0xb1)
label(0xb1)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x06)
goto_next(0x2c)
src/files/setup/setuplip.c
+23 -23
View File
@@ -1314,7 +1314,7 @@ u8 func0410_labtech_showers_sa_pa[] = {
endloop(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -1330,8 +1330,8 @@ u8 func0410_labtech_showers_sa_pa[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06)
if_num_times_shot_lt(1, /*goto*/ 0x06)
if_timer_lt(20, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x06)
if_chr_stopped(/*goto*/ 0x58)
@@ -1696,7 +1696,7 @@ u8 func0418_doorman[] = {
endloop(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -1915,7 +1915,7 @@ u8 func041a_labtech_harrysmate[] = {
endloop(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -1930,8 +1930,8 @@ u8 func041a_labtech_harrysmate[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06)
if_num_times_shot_lt(1, /*goto*/ 0x06)
if_timer_lt(20, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x06)
if_chr_stopped(/*goto*/ 0x58)
@@ -2015,7 +2015,7 @@ u8 func041b_labtech_keycardguy[] = {
endloop(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2032,8 +2032,8 @@ u8 func041b_labtech_keycardguy[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06)
if_num_times_shot_lt(1, /*goto*/ 0x06)
if_timer_lt(20, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x06)
if_chr_stopped(/*goto*/ 0x58)
@@ -2269,7 +2269,7 @@ u8 func0413_mechanic[] = {
endloop(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2285,8 +2285,8 @@ u8 func0413_mechanic[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06)
if_num_times_shot_lt(1, /*goto*/ 0x06)
if_timer_lt(20, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x06)
if_chr_stopped(/*goto*/ 0x58)
@@ -2575,7 +2575,7 @@ u8 func041f_labtech_lights[] = {
endloop(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2591,8 +2591,8 @@ u8 func041f_labtech_lights[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06)
if_num_times_shot_lt(1, /*goto*/ 0x06)
if_timer_lt(20, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x06)
if_chr_stopped(/*goto*/ 0x5e)
@@ -2797,7 +2797,7 @@ u8 func0420_labtech_doors[] = {
goto_next(0x2d)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2812,8 +2812,8 @@ u8 func0420_labtech_doors[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06)
if_num_times_shot_lt(1, /*goto*/ 0x06)
if_timer_lt(20, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x06)
if_chr_stopped(/*goto*/ 0x5e)
@@ -2885,7 +2885,7 @@ u8 func0420_labtech_doors[] = {
label(0x2d)
do_preset_animation(3)
say_quip(CHR_BOND, 0x1d, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_GREETING, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_08000000, BANK_0)
beginloop(0x7b)
@@ -3016,7 +3016,7 @@ u8 func0422_labtech_records[] = {
goto_first(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
label(0x2d)
@@ -3029,8 +3029,8 @@ u8 func0422_labtech_records[] = {
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06)
if_num_times_shot_lt(1, /*goto*/ 0x06)
if_timer_lt(20, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x0d, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x0e, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED1, 0x28, 0x03, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_INJURED2, 0x28, 0x03, 0x01, BANK_0, 0x00, 0x00)
set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0)
label(0x06)
if_chr_stopped(/*goto*/ 0x5e)
src/files/setup/setuplue.c
+1 -1
View File
@@ -2950,7 +2950,7 @@ u8 func0421_activate_autogun[] = {
set_ailist(CHR_SELF, GAILIST_ALERTED)
label(0x0e)
say_quip(CHR_BOND, 0x12, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
restart_timer
chr_do_animation(ANIM_SURPRISED_0202, 0, -1, 0x00, 0x10, CHR_SELF, 2)
src/files/setup/setuppam.c
+2 -2
View File
@@ -3427,7 +3427,7 @@ u8 func040f_miniskedar[] = {
endloop(0x10)
label(0x2e)
say_quip(CHR_BOND, 0x05, 0xff, 0x00, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_GRENADE2, 0xff, 0x00, 0xff, BANK_0, 0x00, 0x00)
set_ailist(CHR_SELF, GAILIST_IDLE)
// Alive
@@ -3479,7 +3479,7 @@ u8 func040f_miniskedar[] = {
endloop(0x0b)
label(0x06)
say_quip(CHR_BOND, 0x04, 0xff, 0x00, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_RETREAT1, 0xff, 0x00, 0xff, BANK_0, 0x00, 0x00)
if_distance_to_target_lt(200, /*goto*/ 0x2f)
miniskedar_try_pounce(0x04, 0x000e, /*goto*/ 0x34)
reloop(0x03)
src/files/setup/setuprit.c
+7 -7
View File
@@ -1778,8 +1778,8 @@ u8 func0413_taker[] = {
label(0x06)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x08)
label(0x08)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, 0x01, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x00, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
restart_timer
beginloop(0x09)
@@ -2741,7 +2741,7 @@ u8 func041e_blonde[] = {
endloop(0x54)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2777,7 +2777,7 @@ u8 func041e_blonde[] = {
label(0x6a)
if_self_flag_bankx_eq(CHRFLAG0_00000004, TRUE, BANK_0, /*goto*/ 0x2d)
set_self_flag_bankx(CHRFLAG0_00000004, BANK_0)
say_quip(CHR_BOND, 0x0b, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SEEPLAYER, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
label(0x2d)
goto_next(0x6c)
@@ -2842,7 +2842,7 @@ u8 func041e_blonde[] = {
goto_first(0x6a)
label(0x6c)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x06)
label(0x06)
goto_first(0x6d)
@@ -2853,7 +2853,7 @@ u8 func041e_blonde[] = {
label(0x76)
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0x74)
label(0x74)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x06)
goto_next(0x2d)
label(0x06)
@@ -2918,7 +2918,7 @@ u8 func0420_trent_attacking[] = {
label(0x76)
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0x74)
label(0x74)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x08)
goto_next(0x2d)
src/files/setup/setupsho.c
+17 -17
View File
@@ -545,7 +545,7 @@ u8 func0402_unarmed_skedar[] = {
label(0x2e)
call_rng
if_rand_gt(1, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x03, 0xff, 0x05, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_GRENADE1, 0xff, 0x05, 0xff, BANK_0, 0x00, 0x00)
label(0x06)
endloop(0x03)
@@ -559,7 +559,7 @@ u8 func0402_unarmed_skedar[] = {
if_enemy_distance_lt_and_los(2540, /*goto*/ 0x2e)
label(0x2e)
set_chr_cloaked(CHR_SELF, FALSE, TRUE)
say_quip(CHR_BOND, 0x01, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
if_distance_to_target_lt(150, /*goto*/ 0x2f)
label(0x54)
if_num_times_shot_lt(1, /*goto*/ 0x2d)
@@ -569,7 +569,7 @@ u8 func0402_unarmed_skedar[] = {
label(0x2d)
restart_timer
set_action(MA_WAITING, TRUE)
say_quip(CHR_BOND, 0x03, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_GRENADE1, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
try_walk_to_target(/*goto*/ 0x08)
beginloop(0x08)
@@ -584,7 +584,7 @@ u8 func0402_unarmed_skedar[] = {
goto_next(0x2d)
label(0x06)
say_quip(CHR_BOND, 0x01, 0x20, 0x00, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0x20, 0x00, 0xff, BANK_0, 0x00, 0x00)
label(0x2d)
restart_timer
set_action(MA_TRACKING, TRUE)
@@ -761,7 +761,7 @@ u8 func0404_miniskedar[] = {
// Healthy
call_rng
say_quip(CHR_BOND, 0x06, 0xff, 0x05, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_RETREAT2, 0xff, 0x05, 0xff, BANK_0, 0x00, 0x00)
label(0x06)
label(0x06)
goto_next(0x54)
@@ -892,7 +892,7 @@ u8 func0408_cloaked_skedar[] = {
// 1 in 256 chance of making skedar roar sound
call_rng
if_rand_gt(1, /*goto*/ 0x06)
say_quip(CHR_BOND, 0x03, 0xff, 0x05, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_GRENADE1, 0xff, 0x05, 0xff, BANK_0, 0x00, 0x00)
label(0x06)
endloop(0x08)
@@ -1674,7 +1674,7 @@ u8 func0409_reaper_slayer_skedar[] = {
endloop(0x5d)
label(0x06)
say_quip(CHR_BOND, 0x19, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_DIE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_shotlist(GAILIST_IDLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -1731,7 +1731,7 @@ u8 func0409_reaper_slayer_skedar[] = {
set_view_distance(100)
if_self_flag_bankx_eq(CHRFLAG0_00000004, TRUE, BANK_0, /*goto*/ 0x2d)
set_self_flag_bankx(CHRFLAG0_00000004, BANK_0)
say_quip(CHR_BOND, 0x0b, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_SEEPLAYER, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00)
label(0x2d)
goto_next(0x71)
@@ -1802,7 +1802,7 @@ u8 func0409_reaper_slayer_skedar[] = {
if_self_flag_bankx_eq(CHRFLAG0_00002000, FALSE, BANK_0, /*goto*/ 0x72)
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0x70)
label(0x70)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x06)
goto_next(0x2d)
@@ -2041,10 +2041,10 @@ u8 func040d_king_combat[] = {
endloop(0x7a)
label(0x06)
say_quip(CHR_BOND, 0x01, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing1(0x0220, 0x0000, /*goto*/ 0x70)
label(0x70)
say_quip(CHR_BOND, 0x00, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK1, 0x19, 0x02, 0x01, BANK_0, 0x00, 0x00)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x7b)
goto_next(0x2d)
@@ -2066,7 +2066,7 @@ u8 func040d_king_combat[] = {
// Spawn skedar
//
label(LABEL_SPAWN_SKEDAR)
say_quip(CHR_BOND, 0x01, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_morale(0)
restart_timer
chr_do_animation(0x0350, 0, -1, 0x10, 0x10, CHR_SELF, 2)
@@ -2085,7 +2085,7 @@ u8 func040d_king_combat[] = {
// Spawn miniskedar
//
label(LABEL_SPAWN_MINISKEDAR)
say_quip(CHR_BOND, 0x01, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_morale(0)
restart_timer
chr_do_animation(0x0350, 0, -1, 0x10, 0x10, CHR_SELF, 2)
@@ -2104,7 +2104,7 @@ u8 func040d_king_combat[] = {
// Cloak and warp to player for hand combat
//
label(LABEL_CLOAK)
say_quip(CHR_BOND, 0x01, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_morale(0)
restart_timer
chr_do_animation(0x0350, 0, -1, 0x10, 0x10, CHR_SELF, 2)
@@ -2154,7 +2154,7 @@ u8 func040d_king_combat[] = {
// Distance to player < 150
label(0x06)
say_quip(CHR_BOND, 0x01, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_chr_cloaked(CHR_SELF, FALSE, TRUE)
restart_timer
dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0,
@@ -2210,7 +2210,7 @@ u8 func040d_king_combat[] = {
// Unreachable - nothing jumps here
label(0x77)
say_quip(CHR_BOND, 0x01, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00)
set_morale(0)
restart_timer
chr_do_animation(0x0350, 0, -1, 0x10, 0x10, CHR_SELF, 2)
@@ -2225,7 +2225,7 @@ u8 func040d_king_combat[] = {
// Shield < 20
label(LABEL_LOW_SHIELD)
say_quip(CHR_BOND, 0x02, 0xff, 0x00, 0xff, BANK_0, 0x00, 0x00)
say_quip(CHR_BOND, QUIP_GOTOCOVER1, 0xff, 0x00, 0xff, BANK_0, 0x00, 0x00)
jog_to_pad(0x0096)
beginloop(0x7d)