From 6385e137d0f0939d997802a10610dce87e9ec9f3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 2 Nov 2022 21:16:18 +1000 Subject: [PATCH] Remove unused global ailists --- src/ailists/gailists.c | 233 +--------------------------------------- src/ailists/setupame.c | 16 +-- src/ailists/setupazt.c | 2 +- src/ailists/setupdam.c | 2 +- src/ailists/setupdepo.c | 8 +- src/ailists/setupear.c | 14 +-- src/ailists/setupeld.c | 4 +- src/ailists/setuplip.c | 2 +- src/ailists/setuplue.c | 8 +- src/ailists/setuppam.c | 2 +- src/ailists/setupsev.c | 30 +++--- src/ailists/setupwax.c | 24 ++--- 12 files changed, 56 insertions(+), 289 deletions(-) diff --git a/src/ailists/gailists.c b/src/ailists/gailists.c index cba37e677..b8e6fa627 100644 --- a/src/ailists/gailists.c +++ b/src/ailists/gailists.c @@ -36,39 +36,6 @@ u8 func0005_end_cinema[] = { endlist }; -/** - * @ailist GAILIST_UNALERTED_0001 - */ -u8 func0001_unalerted_0001[] = { - set_ailist(CHR_SELF, GAILIST_UNALERTED) - endlist -}; - -/** - * @ailist GAILIST_STOP_UNALERTED - */ -u8 func0003_stop_unalerted[] = { - stop_chr - set_ailist(CHR_SELF, GAILIST_UNALERTED) - endlist -}; - -/** - * @ailist GAILIST_UNALERTED_0002 - */ -u8 func0002_unalerted_0002[] = { - set_ailist(CHR_SELF, GAILIST_UNALERTED) - endlist -}; - -/** - * @ailist GAILIST_UNALERTED_0004 - */ -u8 func0004_unalerted_0004[] = { - set_ailist(CHR_SELF, GAILIST_UNALERTED_0002) - endlist -}; - #define LABEL_AIVSAIFAIL 0x16 #define LABEL_DISGUISE_UNCOVERED 0x16 #define LABEL_SCAN_START 0x1a @@ -486,7 +453,7 @@ u8 func0006_unalerted[] = { label(0x13) if_chr_death_animation_finished(CHR_CLONE, /*goto*/ 0x0e) if_chr_knockedout(CHR_CLONE, /*goto*/ 0x0e) - set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) + set_ailist(CHR_SELF, GAILIST_UNALERTED) label(0x0e) try_spawn_clone2(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER, 0, /*goto*/ 0x13) @@ -494,7 +461,7 @@ u8 func0006_unalerted[] = { set_ailist(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER) label(0x13) - set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) + set_ailist(CHR_SELF, GAILIST_UNALERTED) /*************************************************************************** * Near miss @@ -701,7 +668,7 @@ u8 func0006_unalerted[] = { goto_first(LABEL_HEARSPAWN) label(0x13) - set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) + set_ailist(CHR_SELF, GAILIST_UNALERTED) // Unreachable due to set_ailist above increase_self_alertness(255) @@ -789,11 +756,6 @@ u8 func0006_unalerted[] = { endlist }; -u8 unregistered_function1[] = { - set_ailist(CHR_SELF, GAILIST_WAKEUP) - endlist -}; - /** * @ailist GAILIST_WAKEUP */ @@ -3640,28 +3602,6 @@ u8 func000c_combat_with_target_chr[] = { endlist }; -u8 unregistered_function2[] = { - stop_chr - - label(0x19) - stop_chr - yield - goto_first(0x19) - - endlist -}; - -u8 unregistered_function3[] = { - surrender - beginloop(0x19) - if_chr_stopped(/*goto*/ 0x16) - endloop(0x19) - - label(0x16) - return - endlist -}; - /** * @ailist GAILIST_IDLE_0009 * @@ -3679,25 +3619,6 @@ u8 func0000_idle_0009[] = { endlist }; -/** - * @ailist GAILIST_SEE_THEN_ATTACK - * - * Not used. - */ -u8 func000e_see_then_attack[] = { - set_shotlist(GAILIST_ALERTED) - - beginloop(0x0c) - chr_toggle_p1p2(CHR_SELF) - set_target_chr(CHR_P1P2) - if_can_see_target(/*goto*/ 0x16) - endloop(0x0c) - - label(0x16) - set_ailist(CHR_SELF, GAILIST_ALERTED) - endlist -}; - /** * @ailist GAILIST_SHOW_OBJ_FAILED_MSG * @@ -3921,7 +3842,7 @@ u8 func001a_patroller_dis_talking[] = { // Target is disguised, almost uncovered and has weapon equipped... // While it appears the patroller goes unalert here, it's likely that // something in the unalert ailist makes him alert immediately. - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) // Not disguised, or disguised good enough @@ -3951,7 +3872,7 @@ u8 func001a_patroller_dis_talking[] = { // Resume patrol label(0x16) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -5086,62 +5007,6 @@ u8 func0014_buddy_main[] = { endlist }; -/** - * @ailist GAILIST_AVOID - * - * Not used. - */ -u8 func002b_avoid[] = { - beginloop(0x03) - if_chr_stopped(/*goto*/ 0x16) - endloop(0x03) - - label(0x16) - return - endlist -}; - -/** - * @ailist GAILIST_COMMENT_ON_PLAYER_DEAD - * - * Not used. - */ -u8 func0022_comment_on_player_dead[] = { - set_aishootingatmelist(GAILIST_IDLE) - stop_chr - - // Wait until player in sight. Which won't happen if the current chr is - // stopped and player is dying... - beginloop(0x0c) - if_can_see_target(/*goto*/ 0x16) - endloop(0x0c) - - // Wait half a second - label(0x16) - restart_timer - - beginloop(0x03) - if_timer_gt(30, /*goto*/ 0x13) - endloop(0x03) - - // Roll the dice, and maybe wait another half second - label(0x13) - call_rng - if_rand_gt(25, /*goto*/ 0x16) - goto_first(0x03) - - label(0x16) - say_quip(CHR_BOND, QUIP_KILLEDPLAYER2, 0xff, 0x02, 0x00, BANK_0, 0x00, 0x00) - say_quip(CHR_BOND, QUIP_HITPLAYER, 0x80, 0x03, 0x01, BANK_0, 0x00, 0x00) - - beginloop(0x04) - endloop(0x04) - - // Unreachable - set_ailist(CHR_SELF, GAILIST_IDLE) - endlist -}; - /** * @ailist GAILIST_DODGE * @@ -5272,84 +5137,6 @@ u8 func0015_buddy_stealth[] = { }; #endif -/** - * @ailist GAILIST_INIT_SEARCH - * - * Not used. - */ -u8 func002c_init_search_unused[] = { - set_self_flag_bankx(CHRFLAG1_INDARKROOM, BANK_1) - set_self_flag_bankx(CHRFLAG1_SEARCHSAMEROOM, BANK_1) - set_ailist(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER) - endlist -}; - -/** - * @ailist GAILIST_FOLLOW_BOND - * - * Not used. - */ -u8 func0024_follow_bond[] = { - set_target_chr(CHR_BOND) - - label(0x03) - restart_timer - try_run_to_target(/*goto*/ 0x04) - - beginloop(0x04) - set_action(MA_TRACKING, FALSE) - if_distance_to_target_lt(200, /*goto*/ 0x16) - if_timer_gt(120, /*goto*/ 0x13) - if_chr_stopped(/*goto*/ 0x13) - endloop(0x04) - - // Been running for 2 seconds, or stopped - label(0x13) - goto_first(0x03) - - // Within 200 units - label(0x16) - stop_chr - - // Wait here until 300 units away, then follow again - beginloop(0x05) - set_action(MA_WAITING, FALSE) - if_distance_to_target_gt(300, /*goto*/ 0x16) - endloop(0x05) - - label(0x16) - goto_first(0x03) - - endlist -}; - -/** - * @ailist GAILIST_POINTLESS - * - * Not used. - */ -u8 func0025_pointless[] = { - // Wait until target chr is dead - beginloop(0x0c) - if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x03) - if_chr_dead(CHR_TARGET, /*goto*/ 0x03) - endloop(0x0c) - - label(0x03) - // Wait 10 seconds - restart_timer - - beginloop(0x04) - if_timer_gt(600, /*goto*/ 0x13) - endloop(0x04) - - // Continue waiting 10 seconds indefinitely - label(0x13) - goto_first(0x03) - - endlist -}; - /** * @ailist GAILIST_INIT_PSYCHOSIS * @@ -5708,10 +5495,6 @@ u8 func002a_aibot_main[] = { struct ailist g_GlobalAilists[] = { { func0000_idle, GAILIST_IDLE }, - { func0001_unalerted_0001, GAILIST_UNALERTED_0001 }, - { func0004_unalerted_0004, GAILIST_UNALERTED_0004 }, - { func0003_stop_unalerted, GAILIST_STOP_UNALERTED }, - { func0002_unalerted_0002, GAILIST_UNALERTED_0002 }, { func0005_end_cinema, GAILIST_END_CINEMA }, { func0006_unalerted, GAILIST_UNALERTED }, { func0007_alerted, GAILIST_ALERTED }, @@ -5720,7 +5503,6 @@ struct ailist g_GlobalAilists[] = { { func000b_choose_target_chr, GAILIST_CHOOSE_TARGET }, { func000c_combat_with_target_chr, GAILIST_COMBAT_WITH_TARGET }, { func000d_init_combat, GAILIST_INIT_COMBAT }, - { func000e_see_then_attack, GAILIST_SEE_THEN_ATTACK }, { func0016_show_objective_failed_msg, GAILIST_SHOW_OBJ_FAILED_MSG }, { func0017_rebuild_groups, GAILIST_REBUILD_GROUPS }, { func0018_do_bored_animation, GAILIST_DO_BORED_ANIMATION }, @@ -5739,11 +5521,7 @@ struct ailist g_GlobalAilists[] = { { func001e_look_around, GAILIST_LOOK_AROUND }, { func001f_related_to_spawning, GAILIST_RELATED_TO_SPAWNING }, { func001c_surprised, GAILIST_SURPRISED }, - { func0022_comment_on_player_dead, GAILIST_COMMENT_ON_PLAYER_DEAD }, { func0023_dodge, GAILIST_DODGE }, - { func002c_init_search_unused, GAILIST_INIT_SEARCH }, - { func0024_follow_bond, GAILIST_FOLLOW_BOND }, - { func0025_pointless, GAILIST_POINTLESS }, { func0026_init_psychosis, GAILIST_INIT_PSYCHOSIS }, { func0027_psychosised, GAILIST_PSYCHOSISED }, { func002d_invincible_and_idle, GAILIST_INVINCIBLE_AND_IDLE }, @@ -5754,6 +5532,5 @@ struct ailist g_GlobalAilists[] = { { func0028_aibot_dead, GAILIST_AIBOT_DEAD }, { func0029_aibot_init, GAILIST_AIBOT_INIT }, { func002a_aibot_main, GAILIST_AIBOT_MAIN }, - { func002b_avoid, GAILIST_AVOID }, { NULL }, }; diff --git a/src/ailists/setupame.c b/src/ailists/setupame.c index 56be7cb22..f57c3efe9 100644 --- a/src/ailists/setupame.c +++ b/src/ailists/setupame.c @@ -1066,7 +1066,7 @@ u8 unregistered_function[] = { u8 func0402_guard_with_chrflag[] = { set_returnlist(CHR_SELF, 0x0402) set_self_chrflag(CHRCFLAG_00000200) - set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1122,7 +1122,7 @@ u8 func0404_init_hovercar[] = { #define do_path(path) \ assign_path(path) \ start_patrol \ - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) \ + set_ailist(CHR_SELF, GAILIST_UNALERTED) \ endlist u8 func0405_start_path26[] = { @@ -1157,7 +1157,7 @@ u8 func040a_start_path31[] = { set_returnlist(CHR_SELF, 0x040a) assign_path(31) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1172,7 +1172,7 @@ u8 func040b_start_path32[] = { set_shield(0) assign_path(32) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1187,7 +1187,7 @@ u8 func040c_start_path33[] = { set_shield(0) assign_path(33) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1202,14 +1202,14 @@ u8 func040d_start_path34[] = { set_shield(0) assign_path(34) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; u8 func040e_start_path35[] = { assign_path(35) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1993,7 +1993,7 @@ u8 func0413_c318[] = { set_self_chrflag(CHRCFLAG_00000200) rebuild_teams rebuild_squadrons - set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; diff --git a/src/ailists/setupazt.c b/src/ailists/setupazt.c index bdf8bd9c7..d5699fc6d 100644 --- a/src/ailists/setupazt.c +++ b/src/ailists/setupazt.c @@ -930,7 +930,7 @@ u8 func1006_msg_elvisbeable[] = { set_returnlist(CHR_SELF, function) \ assign_path(pathid) \ start_patrol \ - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) u8 func0408_start_path00[] = { init_path(0, 0x0408) diff --git a/src/ailists/setupdam.c b/src/ailists/setupdam.c index 99ee04987..b6f70d56e 100644 --- a/src/ailists/setupdam.c +++ b/src/ailists/setupdam.c @@ -1299,7 +1299,7 @@ u8 func100f_check_researchdata_collected[] = { set_shield(0) \ assign_path(pathid) \ start_patrol \ - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) u8 func0405_start_path00[] = { init_path(0) diff --git a/src/ailists/setupdepo.c b/src/ailists/setupdepo.c index c75b11afc..e88e6e541 100644 --- a/src/ailists/setupdepo.c +++ b/src/ailists/setupdepo.c @@ -521,7 +521,7 @@ u8 func0409_start_path00[] = { set_shield(0) assign_path(0) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -535,7 +535,7 @@ u8 func040a_start_path01[] = { set_shield(0) assign_path(1) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -549,7 +549,7 @@ u8 func040b_start_path02[] = { set_shield(0) assign_path(2) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -563,7 +563,7 @@ u8 func040c_start_path03[] = { set_shield(0) assign_path(3) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; diff --git a/src/ailists/setupear.c b/src/ailists/setupear.c index 6a6852da2..e3b22b4b5 100644 --- a/src/ailists/setupear.c +++ b/src/ailists/setupear.c @@ -855,7 +855,7 @@ s32 path13[] = { set_shield(0) \ assign_path(pathid) \ start_patrol \ - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) u8 func040c_start_path00[] = { init_path(0) @@ -916,15 +916,6 @@ u8 func0414_walk_3_pads[] = { endlist }; -/** - * Unused. - */ -u8 func0401_init_chr_with_flag[] = { - set_self_chrflag(CHRCFLAG_00000200) - set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) - endlist -}; - u8 func0405_init_scientist[] = { set_chr_maxdamage(CHR_SELF, 20) set_ailist(CHR_SELF, AILIST_SCIENTIST) @@ -2037,7 +2028,7 @@ u8 func0408_alarm_responder[] = { label(0x06) rebuild_teams rebuild_squadrons - set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -3308,7 +3299,6 @@ u8 func1424_start_lift[] = { }; struct ailist ailists[] = { - { func0401_init_chr_with_flag, 0x0401 }, { func0402_k7_guard, 0x0402 }, { func0403_k7_scientist, 0x0403 }, { func0404_scientist, 0x0404 }, diff --git a/src/ailists/setupeld.c b/src/ailists/setupeld.c index a9c200d00..4625fc922 100644 --- a/src/ailists/setupeld.c +++ b/src/ailists/setupeld.c @@ -2589,7 +2589,7 @@ u8 func040e_start_path00[] = { init_guard(3, 15, 40, 0) assign_path(0) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -2597,7 +2597,7 @@ u8 func040f_start_path01[] = { init_guard(3, 15, 40, 0) assign_path(1) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; diff --git a/src/ailists/setuplip.c b/src/ailists/setuplip.c index 904813c13..790ebfafe 100644 --- a/src/ailists/setuplip.c +++ b/src/ailists/setuplip.c @@ -1392,7 +1392,7 @@ u8 func1006_check_lab_accessed[] = { set_shield(0) \ assign_path(pathid) \ start_patrol \ - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) u8 func0401_start_path00[] = { init_path(8, 50, 35, 0x00) diff --git a/src/ailists/setuplue.c b/src/ailists/setuplue.c index 52ff909b6..13a78ad53 100644 --- a/src/ailists/setuplue.c +++ b/src/ailists/setuplue.c @@ -875,7 +875,7 @@ struct path paths[] = { u8 func0426_8420[] = { try_inherit_properties(0x04, /*goto*/ 0x2e) label(0x2e) - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -889,7 +889,7 @@ u8 func0426_8420[] = { set_shield(0) \ assign_path(pathid) \ start_patrol \ - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) u8 func0401_start_path00[] = { init_path(0) @@ -924,14 +924,14 @@ u8 func0406_start_path05[] = { u8 func0407_start_path06[] = { assign_path(6) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; u8 func0408_start_path07[] = { assign_path(7) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; diff --git a/src/ailists/setuppam.c b/src/ailists/setuppam.c index cdfcc81a5..3a8ac1600 100644 --- a/src/ailists/setuppam.c +++ b/src/ailists/setuppam.c @@ -4007,7 +4007,7 @@ u8 func1021_c6c4[] = { set_returnlist(CHR_SELF, function) \ assign_path(pathid) \ start_patrol \ - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) u8 func0421_start_path02[] = { init_path(2, 0x0421) diff --git a/src/ailists/setupsev.c b/src/ailists/setupsev.c index 681e3f296..6b8a710ef 100644 --- a/src/ailists/setupsev.c +++ b/src/ailists/setupsev.c @@ -908,7 +908,7 @@ u8 func0401_start_path00[] = { set_shield(0) assign_path(0) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -921,7 +921,7 @@ u8 func0402_start_path01[] = { set_shield(0) assign_path(1) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -934,7 +934,7 @@ u8 func0403_start_path02[] = { set_shield(0) assign_path(2) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -947,7 +947,7 @@ u8 func0404_start_path03[] = { set_shield(0) assign_path(3) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -960,7 +960,7 @@ u8 func0405_start_path04[] = { set_shield(0) assign_path(4) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -973,7 +973,7 @@ u8 func0406_start_path05[] = { set_shield(0) assign_path(5) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -986,7 +986,7 @@ u8 func0407_start_path06[] = { set_shield(0) assign_path(6) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -999,7 +999,7 @@ u8 func0408_start_path07[] = { set_shield(0) assign_path(7) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1012,7 +1012,7 @@ u8 func0409_start_path08[] = { set_shield(0) assign_path(8) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1025,7 +1025,7 @@ u8 func040a_start_path09[] = { set_shield(0) assign_path(9) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1038,7 +1038,7 @@ u8 func040b_start_path10[] = { set_shield(0) assign_path(10) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1051,7 +1051,7 @@ u8 func040c_start_path11[] = { set_shield(0) assign_path(11) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1064,7 +1064,7 @@ u8 func040d_start_path12[] = { set_shield(0) assign_path(12) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1077,7 +1077,7 @@ u8 func040e_start_path13[] = { set_shield(0) assign_path(13) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1090,7 +1090,7 @@ u8 func040f_start_path14[] = { set_shield(0) assign_path(14) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; diff --git a/src/ailists/setupwax.c b/src/ailists/setupwax.c index 11c5cc809..633cc5e69 100644 --- a/src/ailists/setupwax.c +++ b/src/ailists/setupwax.c @@ -1068,35 +1068,35 @@ u8 func0401_init_hovercar[] = { u8 func0402_start_path26[] = { assign_path(26) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; u8 func0403_start_path27[] = { assign_path(27) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; u8 func0404_start_path28[] = { assign_path(28) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; u8 func0405_start_path29[] = { assign_path(29) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; u8 func0406_start_path30[] = { assign_path(30) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1110,7 +1110,7 @@ u8 func0407_start_path31[] = { set_returnlist(CHR_SELF, 0x0407) assign_path(31) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1123,7 +1123,7 @@ u8 func0408_start_path32[] = { set_shield(0) assign_path(32) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1136,7 +1136,7 @@ u8 func0409_start_path33[] = { set_shield(0) assign_path(33) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1149,7 +1149,7 @@ u8 func040a_start_path34[] = { set_shield(0) assign_path(34) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1162,7 +1162,7 @@ u8 func040b_start_path35[] = { set_shield(0) assign_path(35) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; @@ -1175,14 +1175,14 @@ u8 func040c_start_path36[] = { set_shield(0) assign_path(36) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist }; u8 func040d_start_path37[] = { assign_path(37) start_patrol - set_ailist(CHR_SELF, GAILIST_UNALERTED_0004) + set_ailist(CHR_SELF, GAILIST_UNALERTED) endlist };