falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename equip weapon and equip hat commands

This commit is contained in:
Ryan Dwyer 2019-12-27 18:12:57 +10:00
parent 337044901a
commit 044705c818
24 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/files/setup/setupame.c
View File

@ -1952,7 +1952,7 @@ u8 func0415_set_idle[] = {
*/
u8 func0413_c318[] = {
set_accuracy(10)
try_draw_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_squadron(SQUADRON_09)

4
src/files/setup/setupazt.c
View File

@ -948,7 +948,7 @@ u8 func0415_unused[] = {
set_armor(0)
set_recovery_speed(30)
set_shield(0)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x00000000, /*goto*/ 0x08)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x00000000, /*goto*/ 0x08)
label(0x08)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
@ -1032,7 +1032,7 @@ u8 func0416_spawned_guard[] = {
set_armor(0)
set_recovery_speed(30)
set_shield(0)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x00000000, /*goto*/ 0x08)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x00000000, /*goto*/ 0x08)
label(0x08)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)

2
src/files/setup/setupcave.c
View File

@ -3466,7 +3466,7 @@ u8 func0419_ba8c[] = {
u8 func041a_draw_magnum[] = {
set_chr_team(CHR_SELF, TEAM_04)
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x00)
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x00)
label(0x00)
unset_self_flag_bankx(CHRFLAG1_00000001, BANK_1)
set_self_flag_bankx(CHRFLAG0_AIVSAI, BANK_0)

2
src/files/setup/setupdam.c
View File

@ -2142,7 +2142,7 @@ u8 func0404_angry_pilot[] = {
set_self_flag_bankx(CHRFLAG0_00000004, BANK_0)
speak(CHR_TARGET, 0x162f, 0x14dd, CHANNEL_7, COLOR_04_ORANGE) // "Die, you traitors."
chr_do_animation(ANIM_DRAW_PISTOL_0245, -1, 120, 0x06, 0x00, CHR_SELF, 3)
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x00000000, /*goto*/ 0x6c)
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x00000000, /*goto*/ 0x6c)
beginloop(0x6c)
if_chr_stopped(/*goto*/ 0x03)

2
src/files/setup/setupdepo.c
View File

@ -1049,7 +1049,7 @@ u8 func1009_spawner_during_decode[] = {
set_armor(0) \
set_recovery_speed(0) \
set_shield(0) \
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x06) \
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x06) \
label(0x06) \
set_chr_team(CHR_SELF, TEAM_ENEMY) \
set_squadron(SQUADRON_09) \

12
src/files/setup/setupdish.c
View File

@ -4677,7 +4677,7 @@ u8 func1029_holo5_main[] = {
u8 func0406_holo5_init_guard1[] = {
set_alertness(100)
set_chr_id(0x10)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06)
label(0x06)
set_ailist(CHR_SELF, FUNC_HOLO5_GUARD1)
endlist
@ -4757,7 +4757,7 @@ u8 func0408_holo5_init_guard2[] = {
set_chr_health(CHR_SELF, 200)
set_alertness(100)
set_chr_id(0x11)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06)
label(0x06)
remove_displayed_text
display_text(0x01, COLOR_04_ORANGE, 0x1c5d) // "Knock out this target - stealth is the key."
@ -4816,7 +4816,7 @@ u8 func0409_holo5_guard2[] = {
u8 func040a_holo5_init_guard3[] = {
set_reaction_speed(100)
set_chr_id(0x12)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06)
label(0x06)
remove_displayed_text
display_text(0x01, COLOR_04_ORANGE, 0x1c5e) // "And the final guard..."
@ -5453,7 +5453,7 @@ u8 func1030_holo7_main[] = {
u8 func0412_holo7_init_guard1[] = {
set_self_flag_bankx(CHRFLAG0_80000000, BANK_0)
set_chr_id(0x19)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_ailist(CHR_SELF, FUNC_HOLO_GUARD_ARMED_UNALERT)
endlist
@ -5462,7 +5462,7 @@ u8 func0412_holo7_init_guard1[] = {
u8 func0413_holo7_init_guard2[] = {
set_self_flag_bankx(CHRFLAG0_80000000, BANK_0)
set_chr_id(0x1a)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_ailist(CHR_SELF, FUNC_HOLO_GUARD_ARMED_UNALERT)
endlist
@ -5471,7 +5471,7 @@ u8 func0413_holo7_init_guard2[] = {
u8 func0414_holo7_init_guard3[] = {
set_self_flag_bankx(CHRFLAG0_80000000, BANK_0)
set_chr_id(0x1b)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_ailist(CHR_SELF, FUNC_HOLO_GUARD_ARMED_UNALERT)
endlist

4
src/files/setup/setupear.c
View File

@ -2009,7 +2009,7 @@ u8 func0408_alarm_responder[] = {
label(0x06)
try_inherit_properties(0x19, /*goto*/ 0x06)
label(0x06)
try_draw_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_squadron(SQUADRON_09)
@ -2686,7 +2686,7 @@ u8 func0409_uplink_responder[] = {
set_accuracy(10)
label(0x06)
try_draw_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_squadron(SQUADRON_09)

6
src/files/setup/setuplip.c
View File

@ -1991,7 +1991,7 @@ u8 func041a_labtech_harrysmate[] = {
label(0x06)
dprint 'C','R','E','A','T','E','D',' ','W','E','A','P','\n',0,
try_draw_weapon(MODEL_CHRDRUGGUN, WEAPON_TRANQUILIZER, 0x10000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRDRUGGUN, WEAPON_TRANQUILIZER, 0x10000000, /*goto*/ 0x06)
label(0x06)
set_target_chr(CHR_BOND)
set_ailist(CHR_SELF, GFUNC_ALERTED)
@ -2081,7 +2081,7 @@ u8 func041b_labtech_keycardguy[] = {
label(0x06)
dprint 'C','R','E','A','T','E','D',' ','W','E','A','P','\n',0,
try_draw_weapon(MODEL_CHRDRUGGUN, WEAPON_TRANQUILIZER, 0x10000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRDRUGGUN, WEAPON_TRANQUILIZER, 0x10000000, /*goto*/ 0x06)
label(0x06)
set_target_chr(CHR_BOND)
set_ailist(CHR_SELF, GFUNC_ALERTED)
@ -3587,7 +3587,7 @@ u8 func0427_shock_clone[] = {
set_chr_id(0x46)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
set_self_flag_bankx(CHRFLAG1_00080000, BANK_1)
try_draw_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x10000000, /*goto*/ 0x04)
label(0x04)
yield

14
src/files/setup/setuplue.c
View File

@ -1380,7 +1380,7 @@ u8 func0411_init_hangar_guard1[] = {
set_chr_id(0x2c)
set_self_flag_bankx(CHRFLAG0_10000000, BANK_0)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
try_draw_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
jog_to_pad(0x0420)
yield
@ -1402,7 +1402,7 @@ u8 func0412_init_hangar_guard2[] = {
set_chr_id(0x2d)
set_self_flag_bankx(CHRFLAG0_10000000, BANK_0)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
try_draw_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
jog_to_pad(0x041f)
yield
@ -1424,7 +1424,7 @@ u8 func0413_init_hangar_guard3[] = {
set_chr_id(0x2e)
set_self_flag_bankx(CHRFLAG0_10000000, BANK_0)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
try_draw_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
jog_to_pad(0x041e)
yield
@ -1446,7 +1446,7 @@ u8 func0414_init_hangar_guard4[] = {
set_chr_id(0x2f)
set_self_flag_bankx(CHRFLAG0_10000000, BANK_0)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
try_draw_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
jog_to_pad(0x041d)
yield
@ -1477,7 +1477,7 @@ u8 func0417_traitor[] = {
set_accuracy(100)
set_reaction_speed(100)
restart_timer
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x00000000, /*goto*/ 0x03)
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x00000000, /*goto*/ 0x03)
beginloop(0x03)
if_timer_gt(300, /*goto*/ 0x09)
@ -2734,7 +2734,7 @@ u8 func1019_spawn_guards_at_antenna[] = {
};
u8 func040f_spawned_guard[] = {
try_draw_weapon(MODEL_CHRLEEGUN1, WEAPON_MAGSEC4, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRLEEGUN1, WEAPON_MAGSEC4, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
@ -3081,7 +3081,7 @@ u8 func0423_a5e8[] = {
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
set_self_flag_bankx(CHRFLAG0_AIVSAI, BANK_0)
set_self_flag_bankx(CHRFLAG0_CAN_HEARSPAWN, BANK_0)
try_draw_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRDRAGON, WEAPON_DRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
yield

4
src/files/setup/setupoat.c
View File

@ -79,7 +79,7 @@ u8 func0404_spawn_enemies[] = {
};
u8 func0401_init_enemy[] = {
try_draw_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x01)
try_equip_weapon(MODEL_CHRCMP150, WEAPON_CMP150, 0x00000000, /*goto*/ 0x01)
label(0x01)
try_inherit_properties(0x06, /*goto*/ 0x01)
label(0x01)
@ -120,7 +120,7 @@ u8 func0405_spawn_maians[] = {
u8 func0402_init_maian[] = {
set_chr_team(CHR_SELF, TEAM_ALLY)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_MAGSEC4, 0x00000000, /*goto*/ 0x01)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_MAGSEC4, 0x00000000, /*goto*/ 0x01)
label(0x01)
try_inherit_properties(0x07, /*goto*/ 0x01)
label(0x01)

6
src/files/setup/setuppam.c
View File

@ -1248,7 +1248,7 @@ u8 func0406_elvis_follow_and_do_sa_megaweapon[] = {
set_self_chrflag(CHRCFLAG_01000000)
message(CHR_BOND, 0x3014) // "Cetan megaweapon has been disabled."
set_stage_flag(STAGEFLAG_MEGAWEAPON_DISABLED)
try_draw_weapon(MODEL_CHRMAIANPISTOL, WEAPON_PHOENIX, 0x00000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRMAIANPISTOL, WEAPON_PHOENIX, 0x00000000, /*goto*/ 0x04)
label(0x04)
set_ailist(CHR_SELF, FUNC_ELVIS_GO_TO_SA_TELEPORT)
goto_first(0x03)
@ -1401,7 +1401,7 @@ u8 func0403_elvis_give_farsight[] = {
// PA
unset_self_flag_bankx(CHRFLAG1_00200000, BANK_1)
yield
try_draw_weapon(MODEL_CHRMAIANPISTOL, WEAPON_PHOENIX, 0x00000000, /*goto*/ 0x2f)
try_equip_weapon(MODEL_CHRMAIANPISTOL, WEAPON_PHOENIX, 0x00000000, /*goto*/ 0x2f)
label(0x2f)
set_ailist(CHR_SELF, FUNC_ELVIS_FOLLOW_AND_DO_AGENT_MEGAWEAPON)
@ -1412,7 +1412,7 @@ u8 func0403_elvis_give_farsight[] = {
// Agent
label(0x2e)
yield
try_draw_weapon(MODEL_CHRMAIANPISTOL, WEAPON_PHOENIX, 0x00000000, /*goto*/ 0x2e)
try_equip_weapon(MODEL_CHRMAIANPISTOL, WEAPON_PHOENIX, 0x00000000, /*goto*/ 0x2e)
label(0x2e)
set_ailist(CHR_SELF, FUNC_ELVIS_FOLLOW_AND_DO_AGENT_MEGAWEAPON)
endlist

8
src/files/setup/setuppete.c
View File

@ -1842,7 +1842,7 @@ u8 func041d_fbi[] = {
// Draw magnum and go after player
label(0x17)
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x03)
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x03)
label(0x03)
set_ailist(CHR_SELF, GFUNC_ALERTED)
@ -1862,7 +1862,7 @@ u8 func041d_fbi[] = {
label(0x18)
if_stage_flag_eq(STAGEFLAG_ALARM_SOUNDED, FALSE, /*goto*/ 0x04)
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x03)
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x03)
label(0x03)
set_ailist(CHR_SELF, GFUNC_ALERTED)
@ -1888,7 +1888,7 @@ u8 func041d_fbi[] = {
label(0x04)
dprint 'C','R','E','A','T','E','D',' ','W','E','A','P','\n',0,
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x04)
label(0x04)
yield
set_stage_flag(STAGEFLAG_ALARM_SOUNDED)
@ -2364,7 +2364,7 @@ u8 func041f_alarm_responder[] = {
set_armor(0)
set_recovery_speed(0)
set_shield(0)
try_draw_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x00000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x00000000, /*goto*/ 0x04)
label(0x04)
set_chr_team(CHR_SELF, TEAM_20)
set_squadron(GROUP_ALARM_RESPONDER)

18
src/files/setup/setuprit.c
View File

@ -2431,7 +2431,7 @@ u8 func0415_cloner1[] = {
label(0x06)
set_chr_team(CHR_SELF, TEAM_04)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
beginloop(0x04)
if_stage_flag_eq(STAGEFLAG_UFO_ATTACHMENT_DAMAGED, TRUE, /*goto*/ 0x0e)
@ -2488,7 +2488,7 @@ u8 func0416_init_clone1[] = {
set_recovery_speed(30)
set_shield(0)
set_self_flag_bankx(CHRFLAG1_00080000, BANK_1)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
label(0x04)
rebuild_teams
rebuild_squadrons
@ -2522,7 +2522,7 @@ u8 func0418_cloner2[] = {
label(0x06)
set_chr_team(CHR_SELF, TEAM_04)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
yield
yield
yield
@ -2584,7 +2584,7 @@ u8 func0419_init_clone2[] = {
set_recovery_speed(30)
set_shield(0)
set_self_flag_bankx(CHRFLAG1_00080000, BANK_1)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
label(0x04)
rebuild_teams
rebuild_squadrons
@ -2627,7 +2627,7 @@ u8 func041b_cloner3[] = {
yield
yield
set_chr_team(CHR_SELF, TEAM_04)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
beginloop(0x04)
if_stage_flag_eq(STAGEFLAG_UFO_ATTACHMENT_DAMAGED, TRUE, /*goto*/ 0x0e)
@ -2676,7 +2676,7 @@ u8 func041c_init_clone3[] = {
set_recovery_speed(30)
set_shield(0)
set_self_flag_bankx(CHRFLAG1_00080000, BANK_1)
try_draw_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
try_equip_weapon(MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0x10000000, /*goto*/ 0x04)
label(0x04)
rebuild_teams
rebuild_squadrons
@ -3751,7 +3751,7 @@ u8 func040c_init_defend_pad[] = {
rebuild_squadrons
set_target_chr(-1)
label(0x04)
try_draw_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0x2d)
try_equip_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0x2d)
label(0x2d)
set_ailist(CHR_SELF, FUNC_DEFEND_PAD)
endlist
@ -3759,7 +3759,7 @@ u8 func040c_init_defend_pad[] = {
u8 func040e_unused[] = {
label(0x04)
try_draw_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0x2d)
try_equip_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0x2d)
label(0x2d)
set_ailist(CHR_SELF, GFUNC_UNALERTED)
endlist
@ -3770,7 +3770,7 @@ u8 func040e_unused[] = {
*/
u8 func040d_init_defend_president[] = {
label(0x04)
try_draw_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0x2d)
try_equip_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0x2d)
label(0x2d)
set_ailist(CHR_SELF, FUNC_DEFEND_PRESIDENT)
endlist

4
src/files/setup/setupsho.c
View File

@ -2314,7 +2314,7 @@ u8 func0410_init_king_skedar_clone[] = {
set_self_chrflag(CHRCFLAG_HIDDEN)
set_chr_hiddenflag(CHR_SELF, CHRHFLAG_CLOAKED)
yield
try_draw_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x20000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x20000000, /*goto*/ 0x06)
label(0x06)
yield
yield
@ -2373,7 +2373,7 @@ u8 func0412_init_king_miniskedar_clone[] = {
set_self_chrflag(CHRCFLAG_HIDDEN)
set_chr_hiddenflag(CHR_SELF, CHRHFLAG_CLOAKED)
yield
try_draw_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x20000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x20000000, /*goto*/ 0x06)
label(0x06)
yield
yield

8
src/files/setup/setupstat.c
View File

@ -494,7 +494,7 @@ u8 func0405_init_maian[] = {
set_squadron(GROUP_MAIANS)
rebuild_teams
rebuild_squadrons
try_draw_weapon(MODEL_CHRMAIANSMG, WEAPON_CALLISTONTG, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRMAIANSMG, WEAPON_CALLISTONTG, 0x00000000, /*goto*/ 0x06)
label(0x06)
try_inherit_properties(CHR_MAIAN_TEMPLATE, /*goto*/ 0x2d)
label(0x2d)
@ -815,7 +815,7 @@ u8 func100c_spawn_king3_skedar[] = {
};
u8 func0407_king1_skedar[] = {
try_draw_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x00000000, /*goto*/ 0x06)
label(0x06)
try_inherit_properties(CHR_SKEDAR_TEMPLATE, /*goto*/ 0x2d)
label(0x2d)
@ -836,7 +836,7 @@ u8 func0407_king1_skedar[] = {
};
u8 func0408_king2_skedar[] = {
try_draw_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x00000000, /*goto*/ 0x06)
label(0x06)
try_inherit_properties(CHR_SKEDAR_TEMPLATE, /*goto*/ 0x2d)
label(0x2d)
@ -857,7 +857,7 @@ u8 func0408_king2_skedar[] = {
};
u8 func0409_king3_skedar[] = {
try_draw_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRMAULER, WEAPON_MAULER, 0x00000000, /*goto*/ 0x06)
label(0x06)
try_inherit_properties(CHR_SKEDAR_TEMPLATE, /*goto*/ 0x2d)
label(0x2d)

8
src/files/setup/setuptra.c
View File

@ -1552,7 +1552,7 @@ u8 func1008_spawngroup1_guard[] = {
set_armor(40)
set_recovery_speed(0)
set_shield(0)
try_draw_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
@ -1627,7 +1627,7 @@ u8 func1013_spawngroup2_guard[] = {
set_armor(40)
set_recovery_speed(0)
set_shield(0)
try_draw_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
@ -1730,7 +1730,7 @@ u8 func1014_spawngroup3_guard[] = {
set_armor(40)
set_recovery_speed(0)
set_shield(0)
try_draw_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
@ -1812,7 +1812,7 @@ u8 func1015_spawngroup4_guard[] = {
set_armor(40)
set_recovery_speed(0)
set_shield(0)
try_draw_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
try_equip_weapon(MODEL_CHRSUPERDRAGON, WEAPON_SUPERDRAGON, 0x00000000, /*goto*/ 0x06)
label(0x06)
set_chr_team(CHR_SELF, TEAM_ENEMY)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)

2
src/files/setup/setupwax.c
View File

@ -1323,7 +1323,7 @@ u8 func0411_cass_in_office[] = {
label(0x57)
set_self_flag_bankx(CHRFLAG0_00002000, BANK_0)
chr_do_animation(0x0245, 0, -1, 0x10, 0x10, CHR_SELF, 2)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x2c)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x2c)
label(0x2c)
speak(CHR_TARGET, 0x4a07, 0x81a3, CHANNEL_6, COLOR_04_ORANGE) // "Get the hell out of my office..."

8
src/game/chr/chraicommands.c
View File

@ -5886,7 +5886,7 @@ glabel aiSpawnChrAtChr
* @cmd 00c8
*/
GLOBAL_ASM(
glabel ai00c8
glabel aiTryEquipWeapon
/* f05580c: 3c09800a */ lui $t1,%hi(g_Vars)
/* f055810: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
/* f055814: 8d250438 */ lw $a1,0x438($t1)
@ -6039,7 +6039,7 @@ glabel ai00c8
/**
* @cmd 00c9
*/
bool ai00c9(void)
bool aiTryEquipHat(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
u32 flags = (cmd[5] << 16) | (cmd[6] << 8) | cmd[7] | (cmd[4] << 24);
@ -6047,7 +6047,7 @@ bool ai00c9(void)
bool ok = false;
if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->unk020) {
ok = func0f089dd8(g_Vars.chrdata, thing, flags);
ok = chrTryEquipHat(g_Vars.chrdata, thing, flags);
}
if (ok) {
@ -6189,7 +6189,7 @@ glabel aiDuplicateChr
/* f055cf0: 8e2b0114 */ lw $t3,0x114($s1)
/* f055cf4: 8c620004 */ lw $v0,0x4($v1)
/* f055cf8: 00003025 */ or $a2,$zero,$zero
/* f055cfc: 0fc22776 */ jal func0f089dd8
/* f055cfc: 0fc22776 */ jal chrTryEquipHat
/* f055d00: 84450004 */ lh $a1,0x4($v0)
/* f055d04: 8e2b0114 */ lw $t3,0x114($s1)
.L0f055d08:

2
src/game/game_066310.c
View File

@ -41460,7 +41460,7 @@ glabel func0f089db8
);
GLOBAL_ASM(
glabel func0f089dd8
glabel chrTryEquipHat
/* f089dd8: 27bdff60 */ addiu $sp,$sp,-160
/* f089ddc: afbf002c */ sw $ra,0x2c($sp)
/* f089de0: afa400a0 */ sw $a0,0xa0($sp)

6
src/include/commands.h
View File

@ -1013,14 +1013,14 @@
mkword(props), \
label,
#define try_draw_weapon(model, weapon, u1, label) \
#define try_equip_weapon(model, weapon, flags, label) \
mkshort(0x00c8), \
mkshort(model), \
weapon, \
mkword(u1), \
mkword(flags), \
label,
#define cmd00c9(u1, flags, label) \
#define try_equip_hat(u1, flags, label) \
mkshort(0x00c9), \
mkshort(u1), \
mkword(flags), \

4
src/include/game/chr/chraicommands.h
View File

@ -202,8 +202,8 @@
/*0x00c5*/ bool aiIfCountdownTimerGreaterThan(void);
/*0x00c6*/ bool aiSpawnChrAtPad(void);
/*0x00c7*/ bool aiSpawnChrAtChr(void);
/*0x00c8*/ bool ai00c8(void);
/*0x00c9*/ bool ai00c9(void);
/*0x00c8*/ bool aiTryEquipWeapon(void);
/*0x00c9*/ bool aiTryEquipHat(void);
/*0x00ca*/ bool aiDuplicateChr(void);
/*0x00cb*/ bool aiMessage(void);
/*0x00cc*/ bool aiShowText2(void);

2
src/include/game/game_066310.h
View File

@ -253,7 +253,7 @@ u32 func0f089a94(void);
u32 func0f089c70(void);
u32 func0f089d64(void);
u32 func0f089db8(void);
u32 func0f089dd8(struct chrdata *chr, u32 thing, u32 flags);
u32 chrTryEquipHat(struct chrdata *chr, u32 thing, u32 flags);
u32 func0f089f8c(void);
u32 func0f08a38c(void);
u32 func0f08a724(void);

4
src/setup/ailists.c
View File

@ -1045,9 +1045,9 @@ u8 func0007_alerted[] = {
label(0x16)
if_stage_is_not(STAGE_AIRFORCEONE, /*goto*/ 0x13)
try_draw_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0xe5)
try_equip_weapon(MODEL_CHRCYCLONE, WEAPON_CYCLONE, 0x00000000, /*goto*/ 0xe5)
label(0x13)
try_draw_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0xe5)
try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0xe5)
beginloop(0xe5)
if_chr_stopped(/*goto*/ 0x16)

4
src/setup/setup_000000.c
View File

@ -14332,8 +14332,8 @@ bool (*g_CommandPointers[])(void) = {
/*0x00c5*/ aiIfCountdownTimerGreaterThan,
/*0x00c6*/ aiSpawnChrAtPad,
/*0x00c7*/ aiSpawnChrAtChr,
/*0x00c8*/ ai00c8,
/*0x00c9*/ ai00c9,
/*0x00c8*/ aiTryEquipWeapon,
/*0x00c9*/ aiTryEquipHat,
/*0x00ca*/ aiDuplicateChr,
/*0x00cb*/ aiMessage,
/*0x00cc*/ aiShowText2,