diff --git a/src/game/chrai.c b/src/game/chrai.c index 43ad43095..1beeee991 100644 --- a/src/game/chrai.c +++ b/src/game/chrai.c @@ -664,7 +664,7 @@ u32 chraiGoToLabel(u8 *ailist, u32 aioffset, u8 label) return 0; } - aioffset += chraiGetCommandLength(ailist, aioffset); + aioffset += g_CommandLengths[type]; } while (true); } @@ -779,15 +779,8 @@ void chraiExecute(void *entity, s32 proptype) u8 *cmd = g_Vars.aioffset + g_Vars.ailist; s32 type = (cmd[0] << 8) + cmd[1]; - if (type >= 0 && type < ARRAYCOUNT(g_CommandPointers)) { - if (g_CommandPointers[type]()) { - break; - } - } else { - // This is attempting to handle situations where the command - // type is invalid by passing over them and continuing - // execution. This would very likely result in a crash though. - g_Vars.aioffset += chraiGetCommandLength(g_Vars.ailist, g_Vars.aioffset); + if (g_CommandPointers[type]()) { + break; } } } @@ -798,16 +791,6 @@ u32 chraiGetCommandLength(u8 *ailist, u32 aioffset) u8 *cmd = aioffset + ailist; s32 type = (cmd[0] << 8) + cmd[1]; - if (type == CMD_PRINT) { - u32 prop = aioffset + 2; - - while (ailist[prop] != 0) { - ++prop; - } - - return (prop - aioffset) + 1; - } - if (type >= 0 && type < ARRAYCOUNT(g_CommandLengths)) { return g_CommandLengths[type]; } diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index 787027b44..29213af2e 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -3811,21 +3811,6 @@ bool aiChrCopyPadPreset(void) */ bool aiPrint(void) { - u32 len; - u32 result = dprint(); - - if (result) { - result = 2; - } - - if (result == 2) { - // empty - } - - len = chraiGetCommandLength(g_Vars.ailist, g_Vars.aioffset); - - g_Vars.aioffset += len; - return false; } diff --git a/src/game/gailists.c b/src/game/gailists.c index df7d2516f..02a476ed1 100644 --- a/src/game/gailists.c +++ b/src/game/gailists.c @@ -19,7 +19,6 @@ * @ailist GAILIST_IDLE */ u8 func0000_idle[] = { - dprint 'd','y','e','n','g',0, beginloop(0x0d) endloop(0x0d) @@ -99,7 +98,6 @@ u8 func0006_unalerted[] = { if_chr_knockedout(CHR_SELF, /*goto*/ 0x15) if_just_injured(CHR_SELF, /*goto*/ 0x16) if_has_gun(CHR_SELF, /*goto*/ 0x13) - dprint 'N','O','G','U','N','\n',0, goto_next(0x16) // Has gun @@ -108,14 +106,12 @@ u8 func0006_unalerted[] = { // Dying label(0x15) - dprint 'D','I','E',' ','I','N','S','C','A','N','\n',0, set_shotlist(GAILIST_IDLE) set_ailist(CHR_SELF, GAILIST_IDLE) // Injured or gun has just been shot out of hand label(0x16) say_quip(CHR_BOND, QUIP_SHOTUNALERT, 0x78, 0x03, 0x00, BANK_0, 0x00, 0x00) - dprint 'N','O','G','U','N',',','\n',0, if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, FALSE, BANK_1, /*goto*/ 0x06) unset_self_flag_bankx(CHRFLAG1_DOINGIDLEANIMATION, BANK_1) if_chr_idle_action_eq(IDLEACTION_SITTING_TYPING, /*goto*/ 0x05) @@ -124,19 +120,15 @@ u8 func0006_unalerted[] = { // Injured or gun dropped while sitting -> stand up label(0x05) - dprint 'N','O','G','U','N','2','\n',0, - dprint 'A','N','I','M',' ','O','B','J','E','C','T',' ','N','O','W','\n',0, set_chr_maxdamage(CHR_SELF, 40) object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, CHRANIMFLAG_MOVEWHENINVIS, 16, CHR_SELF, 2) unset_self_flag_bankx(CHRFLAG1_DOINGIDLEANIMATION, BANK_1) set_chr_special_death_animation(CHR_SELF, SPECIALDIE_NONE) - dprint 'B','4',' ','W','A','T','\n',0, goto_next(0x0c) // Injured or gun dropped while standing label(0x06) - dprint 'B','E','E','N',' ','S','H','O','T','\n',0, if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_ASKEDABOUTGUN, /*goto*/ 0x14) goto_next(0x13) @@ -163,21 +155,16 @@ u8 func0006_unalerted[] = { if_self_flag_bankx_eq(CHRFLAG1_PREWARNED, TRUE, BANK_1, /*goto*/ LABEL_SCAN_START) say_quip(CHR_BOND, QUIP_SHOTUNALERT, 0xff, 0x03, 0x00, BANK_0, 0x00, 0x00) - dprint 'N','O',' ','W','A','R','N','I','N','G','\n',0, if_self_flag_bankx_eq(CHRFLAG0_CANT_ALERT_GROUP, TRUE, BANK_0, /*goto*/ 0x13) increase_squadron_alertness(100) label(0x13) - dprint 'N','O',' ','W','A','R','N','I','N','G','\n',0, set_ailist(CHR_SELF, GAILIST_WAKEUP) - dprint 'S','1',0, // Armed label(LABEL_SCAN_START) - dprint 'S','C','A','N',' ','S','T','A','R','T','\n',0, set_action(MA_NORMAL, TRUE) yield - dprint 'S','2',0, chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) @@ -185,7 +172,6 @@ u8 func0006_unalerted[] = { if_alertness(100, OPERATOR_LESS_THAN, /*goto*/ 0x16) // Chr is already alert - dprint 'A','L','E','R','T',' ','F','A','I','\n',0, goto_next(0x78) // If not alert, check for witnessing death or injury @@ -196,70 +182,55 @@ u8 func0006_unalerted[] = { // Check if target is in sight label(0x13) - dprint 'A','1','\n',0, if_target_outside_my_yvisang(/*goto*/ 0x16) if_target_in_sight(/*goto*/ LABEL_SEE_DETECT) // Check if AIVSAI is enabled and can see AI enemy label(0x16) - dprint 'B','4',' ','A','I','V','S','A','I','\n',0, if_self_flag_bankx_eq(CHRFLAG0_AIVSAI, FALSE, BANK_0, /*goto*/ LABEL_AIVSAIFAIL) - dprint 'A','I','V','S','A','I','S','E','T','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x13) - dprint 'A','I','V','S','A','I','F','A','I','L','\n',0, goto_next(LABEL_AIVSAIFAIL) label(0x13) - dprint 'A','I','V','S','A','I','P','A','S','S','\n',0, if_target_is_player(/*goto*/ LABEL_AIVSAIFAIL) goto_next(0x12) // Check for near miss and hear label(LABEL_AIVSAIFAIL) - dprint 'S','4',0, if_near_miss(/*goto*/ LABEL_SEE_DETECT) if_num_times_shot_gt(0, /*goto*/ LABEL_SEE_DETECT) - dprint 'B','4','N','O','H','E','A','R','\n',0, if_self_flag_bankx_eq(CHRFLAG0_NOHEAR, FALSE, BANK_0, /*goto*/ 0x16) if_can_see_target(/*goto*/ 0x16) goto_next(0x13) // Hear enabled, or hear disabled but can see target label(0x16) - dprint 'C','H','E','K','H','E','A','R','\n',0, if_heard_target_recently(/*goto*/ LABEL_HEAR_DETECT) label(0x13) - dprint 'N','O','T','H','E','A','R','D','\n',0, // Check alarm label(0x13) - dprint 'N','2','\n',0, if_self_flag_bankx_eq(CHRFLAG0_CAN_HEAR_ALARMS, FALSE, BANK_0, /*goto*/ 0x16) - dprint 'N','3','\n',0, if_alarm_active(/*goto*/ LABEL_HEARD_ALARM) // Hear alarm is disabled for this chr, or alarm is off label(0x16) - dprint 'N','1','\n',0, if_alarm_active(/*goto*/ 0x13) goto_next(0x16) // Alarm on but chr is not allowed to hear it label(0x13) - dprint 'A','L',' ','O','N','A','R','D','\n',0, if_stage_is_not(STAGE_PELAGIC, /*goto*/ 0x16) if_onscreen(/*goto*/ LABEL_HEARD_ALARM) // Check if can see camspy label(0x16) set_target_to_camspy_if_in_sight(/*goto*/ 0x16) - dprint 'E','S',' ','N','O','V','I','S','\n',0, goto_next(0x13) // Can see camspy label(0x16) - dprint 'S','E','E','E','Y','E','S','P','Y','\n',0, if_patrolling(/*goto*/ 0x15) set_returnlist(CHR_SELF, GAILIST_UNALERTED) set_ailist(CHR_SELF, GAILIST_OBSERVE_CAMSPY) @@ -274,7 +245,6 @@ u8 func0006_unalerted[] = { if_self_flag_bankx_eq(CHRFLAG1_NOIDLEANIMS, TRUE, BANK_1, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, TRUE, BANK_1, /*goto*/ 0x13) if_self_flag_bankx_eq(CHRFLAG1_TALKINGTODISGUISE, FALSE, BANK_1, /*goto*/ 0x15) - dprint 'C','H','E','C','K',' ','S','O','U','F','I','\n',0, // check sound finished if_chr_not_talking(CHR_SELF, /*goto*/ 0x28) if_timer_gt(60, /*goto*/ 0x28) goto_next(0x15) @@ -324,13 +294,11 @@ u8 func0006_unalerted[] = { **************************************************************************/ label(0x13) - dprint 'N','A','T',' ','A','N','I','M','S','\n',0, if_chr_idle(/*goto*/ 0x16) set_returnlist(CHR_SELF, GAILIST_UNALERTED) set_ailist(CHR_SELF, GAILIST_BUSY) label(0x16) - dprint 'I','N',' ','A','N','I','M','S','\n',0, goto_first(LABEL_SCAN_START) /*************************************************************************** @@ -338,7 +306,6 @@ u8 func0006_unalerted[] = { **************************************************************************/ label(LABEL_SEE_DETECT) - dprint 'S','E','E',' ','D','E','T','E','C','T','\n',0, if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISE_UNCOVERED, /*goto*/ LABEL_DISGUISE_UNCOVERED) label(0x13) @@ -355,7 +322,6 @@ u8 func0006_unalerted[] = { if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_04000000, /*goto*/ LABEL_DISGUISE_UNCOVERED) label(0x15) - dprint 'N','O','T',' ','A','I','M','I','N','G',' ','A','T',' ','M','E','\n',0, label(0x13) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISED, /*goto*/ 0x13) @@ -383,7 +349,6 @@ u8 func0006_unalerted[] = { if_chr_weapon_equipped(CHR_TARGET, WEAPON_COMBATBOOST, /*goto*/ 0xe6) if_chr_weapon_equipped(CHR_TARGET, WEAPON_HORIZONSCANNER, /*goto*/ 0xe6) if_chr_weapon_equipped(CHR_TARGET, WEAPON_SUITCASE, /*goto*/ 0xe6) - dprint 'T','A','L','K',' ','D','I','S','T',' ','G','U','N','\n',0, if_distance_to_target_gt(900, /*goto*/ 0x15) goto_next(0xe8) @@ -416,7 +381,6 @@ u8 func0006_unalerted[] = { **************************************************************************/ label(LABEL_DISGUISE_UNCOVERED) - dprint 'D','I','S','B','R','O','K','E','N','\n',0, if_near_miss(/*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG0_SURPRISABLE, TRUE, BANK_0, /*goto*/ 0x94) @@ -443,7 +407,6 @@ u8 func0006_unalerted[] = { label(0x16) yield yield - dprint 'S','3',0, say_quip(CHR_BOND, QUIP_SHOTUNALERT, 0xff, 0x03, 0x00, BANK_0, 0x00, 0x00) increase_squadron_alertness(100) goto_next(0x77) @@ -452,7 +415,6 @@ u8 func0006_unalerted[] = { label(0x94) label(0x16) set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_DETECTED) - dprint 'S','U','R','P','R','I','S','E','D','!','\n',0, say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) restart_timer if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, FALSE, BANK_1, /*goto*/ 0x16) @@ -468,7 +430,6 @@ u8 func0006_unalerted[] = { chr_do_animation(ANIM_SURPRISED_0202, 0, -1, 0, 16, CHR_SELF, 2) beginloop(0x73) - dprint 'S','4',0, if_timer_gt(60, /*goto*/ 0x77) endloop(0x73) @@ -486,8 +447,6 @@ u8 func0006_unalerted[] = { label(LABEL_HEAR_DETECT) yield - dprint 'S','7',0, - dprint 'H','E','A','R','D','E','T','E','C','T','\n',0, say_quip(CHR_BOND, QUIP_HEARNOISE, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) if_self_flag_bankx_eq(CHRFLAG0_CAN_HEARSPAWN, TRUE, BANK_0, /*goto*/ LABEL_HEARSPAWN) restart_timer @@ -495,7 +454,6 @@ u8 func0006_unalerted[] = { chr_do_animation(ANIM_YAWN, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x80) - dprint 'S','8',0, if_timer_gt(60, /*goto*/ 0x81) endloop(0x80) @@ -513,9 +471,7 @@ u8 func0006_unalerted[] = { **************************************************************************/ label(LABEL_HEARSPAWN) - dprint 'H','E','A','R','S','P','A','W','N','\n',0, if_never_been_onscreen(/*goto*/ 0x0e) - dprint 'N','E','V','E','R',' ','V','I','S','F','A','I','L','\n',0, set_ailist(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER) label(0x0e) @@ -528,15 +484,12 @@ u8 func0006_unalerted[] = { set_alertness(100) label(0x13) - dprint 'C','H','E','C','K',' ','D','U','P','E','\n',0, if_chr_death_animation_finished(CHR_CLONE, /*goto*/ 0x0e) if_chr_knockedout(CHR_CLONE, /*goto*/ 0x0e) set_ailist(CHR_SELF, GAILIST_UNALERTED_0001) label(0x0e) - dprint 'C','R','E','A','T','E',' ','S','P','A','W','N','\n',0, try_spawn_clone2(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER, 0, /*goto*/ 0x13) - dprint 'C','R','E','A','T','E',' ','F','A','I','L','\n',0, if_self_flag_bankx_eq(CHRFLAG0_ALERT_ON_HEARSPAWN, TRUE, BANK_0, /*goto*/ 0x13) set_ailist(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER) @@ -584,20 +537,17 @@ u8 func0006_unalerted[] = { **************************************************************************/ label(LABEL_SEEFRIENDDIE) - dprint 'S','E','E','F','R','I','E','N','D','D','I','E','\n',0, if_self_flag_bankx_eq(CHRFLAG0_SURPRISABLE, FALSE, BANK_0, /*goto*/ 0x17) // Surprised due to seeing friend die label(0x94) label(0x16) - dprint 'S','U','R','P','R','I','S','E','D','!','\n',0, say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) restart_timer if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, TRUE, BANK_1, /*goto*/ 0x76) chr_do_animation(ANIM_SURPRISED_0202, 0, -1, 0, 16, CHR_SELF, 2) beginloop(0x76) - dprint 'S','6',0, if_timer_gt(60, /*goto*/ 0x17) endloop(0x76) @@ -605,11 +555,8 @@ u8 func0006_unalerted[] = { label(0x17) if_self_flag_bankx_eq(CHRFLAG0_CAN_EXAMINE_BODY, FALSE, BANK_0, /*goto*/ 0x7d) try_jog_to_chr(CHR_SEEDIE, /*goto*/ 0x7e) - dprint 'W','A','L','K','F','A','I','L','\n',0, beginloop(0x7e) - dprint 'S','9',0, - dprint 'W','A','L','K','I','N','G','\n',0, if_saw_injury(0x00, /*goto*/ 0x16) chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) @@ -630,8 +577,6 @@ u8 func0006_unalerted[] = { kneel beginloop(0x7c) - dprint 'T','1',0, - dprint 'E','X','A','M',' ','B','O','D','Y','\n',0, if_saw_injury(0, /*goto*/ 0x16) set_hear_distance(10000) chr_toggle_p1p2(CHR_SELF) @@ -664,7 +609,6 @@ u8 func0006_unalerted[] = { // Examination finished label(0x7d) - dprint 'E','X','A','M',' ','B','O','D','Y','D','O','N','E','\n',0, set_target_chr(CHR_BOND) if_nearly_in_targets_sight(30, /*goto*/ 0x13) goto_next(0x16) @@ -697,7 +641,6 @@ u8 func0006_unalerted[] = { // Unreachable - nothing jumps here label(0x22) increase_self_alertness(100) - dprint 'S','E','E',' ','O','B','J','E','C','T','\n',0, goto_next(0x16) /*************************************************************************** @@ -705,7 +648,6 @@ u8 func0006_unalerted[] = { **************************************************************************/ label(LABEL_HEARD_ALARM) - dprint 'H','E','A','R','D',' ','A','L','A','R','M','\n',0, if_self_flag_bankx_eq(CHRFLAG1_HEARSPAWN_ALERT_IF_ALARM, FALSE, BANK_1, /*goto*/ 0x13) set_self_flag_bankx(CHRFLAG0_ALERT_ON_HEARSPAWN, BANK_0) @@ -716,7 +658,6 @@ u8 func0006_unalerted[] = { chr_do_animation(ANIM_YAWN, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x82) - dprint 'T','2',0, if_timer_gt(60, /*goto*/ 0x81) endloop(0x82) @@ -731,9 +672,7 @@ u8 func0006_unalerted[] = { label(LABEL_HEARSPAWN) yield - dprint 'H','E','A','R','S','P','A','W','N','\n',0, if_never_been_onscreen(/*goto*/ 0x0e) - dprint 'N','E','V','E','R',' ','V','I','S','F','A','I','L','\n',0, set_ailist(CHR_SELF, GAILIST_WAKEUP) label(0x0e) @@ -741,7 +680,6 @@ u8 func0006_unalerted[] = { set_ailist(CHR_SELF, GAILIST_WAKEUP) label(0x13) - dprint 'C','H','E','C','K',' ','D','U','P','E','\n',0, if_chr_death_animation_finished(CHR_CLONE, /*goto*/ 0x0e) if_chr_knockedout(CHR_CLONE, /*goto*/ 0x0e) if_self_flag_bankx_eq(CHRFLAG0_ALERT_ON_HEARSPAWN, FALSE, BANK_0, /*goto*/ 0x13) @@ -751,9 +689,7 @@ u8 func0006_unalerted[] = { goto_first(LABEL_SCAN_START) label(0x0e) - dprint 'C','R','E','A','T','E',' ','S','P','A','W','N','\n',0, try_spawn_clone2(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER, 0, /*goto*/ 0x13) - dprint 'C','R','E','A','T','E',' ','F','A','I','L','\n',0, if_self_flag_bankx_eq(CHRFLAG0_ALERT_ON_HEARSPAWN, FALSE, BANK_0, /*goto*/ 0x16) goto_first(LABEL_HEARSPAWN) @@ -783,7 +719,6 @@ u8 func0006_unalerted[] = { goto_first(0x0e) // create spawn label(0x13) - dprint 'W','A','R','N','E','D','B','Y','F','R','I','E','N','D','\n',0, if_self_flag_bankx_eq(CHRFLAG0_CAN_HEARSPAWN, FALSE, BANK_0, /*goto*/ 0x13) set_alertness(0) goto_first(LABEL_HEARSPAWN) @@ -795,13 +730,10 @@ u8 func0006_unalerted[] = { chr_do_animation(ANIM_YAWN, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x7a) - dprint 'T','3',0, if_timer_gt(60, /*goto*/ 0x7b) endloop(0x7a) label(0x7b) - dprint 'W','A','R','N','E','D','B','E','N','D','\n',0, - dprint 'W','A','R','N','E','D','B','E','N','D','2','\n',0, set_ailist(CHR_SELF, GAILIST_WAKEUP) // Unreachable - nothing jumps here @@ -823,7 +755,6 @@ u8 func0006_unalerted[] = { // Surprised at seeing another enemy AI? label(0x13) - dprint 'W','A','R','N','E','D','B','E','N','D','3','\n',0, if_self_flag_bankx_eq(CHRFLAG0_SURPRISABLE, FALSE, BANK_0, /*goto*/ 0x77) say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) restart_timer @@ -831,7 +762,6 @@ u8 func0006_unalerted[] = { chr_do_animation(ANIM_SURPRISED_0202, 0, -1, 0, 16, CHR_SELF, 2) beginloop(0x75) - dprint 'S','6',0, if_timer_gt(60, /*goto*/ 0x77) endloop(0x75) @@ -850,7 +780,6 @@ u8 func0006_unalerted[] = { **************************************************************************/ label(0x0c) - dprint 'G','O','T',' ','W','A','T','\n',0, yield if_chr_stopped(/*goto*/ 0x13) goto_first(0x0c) @@ -861,7 +790,6 @@ u8 func0006_unalerted[] = { }; u8 unregistered_function1[] = { - dprint 'I','V','E','I','J','U','R','E','D','\n',0, set_ailist(CHR_SELF, GAILIST_WAKEUP) endlist }; @@ -897,7 +825,6 @@ u8 func0008_wakeup[] = { // About to stand up label(0x05) - dprint 'A','N','I','M',' ','O','B','J','E','C','T',' ','N','O','W','\n',0, yield if_chr_death_animation_finished(CHR_SELF, /*goto*/ 0x13) if_chr_dead(CHR_SELF, /*goto*/ 0x13) @@ -922,7 +849,6 @@ u8 func0008_wakeup[] = { // Wait for stand up animation to finish label(0x0c) - dprint 'G','O','T',' ','W','A','T','\n',0, yield if_chr_stopped(/*goto*/ 0x13) goto_first(0x0c) @@ -991,11 +917,9 @@ u8 func0007_alerted[] = { set_aishootingatmelist(GAILIST_DODGE) set_darkroomlist(GAILIST_SEARCH_FOR_PLAYER) - dprint 'S','T','A','R','T',' ','L','O','O','P','\n',0, if_chr_dead(CHR_SELF, /*goto*/ 0x16) if_chr_death_animation_finished(CHR_SELF, /*goto*/ 0x16) if_chr_knockedout(CHR_SELF, /*goto*/ 0x16) - dprint 'N','O','T',' ','D','E','A','D','\n',0, goto_next(0x13) // Dying @@ -1006,7 +930,6 @@ u8 func0007_alerted[] = { restart_timer beginloop(0x1c) - dprint 'D','I','E',' ','L','O','O','P','\n',0, if_timer_gt(15, /*goto*/ 0x16) endloop(0x1c) @@ -1017,7 +940,6 @@ u8 func0007_alerted[] = { // Alive label(0x13) - dprint 'S','T','A','R','T',' ','L','O','O','P','2','\n',0, if_just_injured(CHR_SELF, /*goto*/ 0x16) if_has_gun(CHR_SELF, /*goto*/ 0x13) goto_next(0x16) @@ -1032,7 +954,6 @@ u8 func0007_alerted[] = { restart_timer unset_self_flag_bankx(CHRFLAG1_CAN_RELOAD, BANK_1) unset_self_flag_bankx(CHRFLAG1_CAN_DRAW_PISTOL, BANK_1) - dprint 'C','H','E','C','K','I','N','J','U','R','Y','\n',0, // Say an injury quip if we haven't already, then wait up to 3 seconds for // the chr to have finished their injury animation @@ -1054,12 +975,9 @@ u8 func0007_alerted[] = { label(0x13) #if VERSION >= VERSION_NTSC_1_0 stop_chr - dprint 'I','N','J',' ','O','V','E','R','\n',0, #endif if_self_flag_bankx_eq(CHRFLAG1_CAN_DRAW_PISTOL, TRUE, BANK_1, /*goto*/ LABEL_DRAW_PISTOL) - dprint 'B','4',' ','G','U','N','\n',0, if_has_gun(CHR_SELF, /*goto*/ LABEL_MAINLOOP) - dprint 'L','O','S','T',' ','M','Y',' ','G','U','N','\n',0, label(0xac) set_chr_dodge_rating(2, 0) @@ -1072,7 +990,6 @@ u8 func0007_alerted[] = { // picked up by the player, or we've been waiting for 5 seconds then go to // GETGUN_FAILED. label(0xb0) - dprint 'W','A','I','T','I','N','G','\n',0, yield yield yield @@ -1089,7 +1006,6 @@ u8 func0007_alerted[] = { go_to_gun(/*goto*/ 0xad) beginloop(0xad) - dprint 'G','O',' ','F','O','R',' ','G','U','N','\n',0, if_timer_gt(300, /*goto*/ LABEL_GETGUN_FAILED) if_gun_unclaimed(-1, TRUE, /*goto*/ 0x13) goto_next(LABEL_GETGUN_FAILED) @@ -1100,7 +1016,6 @@ u8 func0007_alerted[] = { endloop(0xad) label(0x16) - dprint 'A','T',' ','G','U','N','\n',0, restart_timer chr_do_animation(ANIM_PICK_UP_GUN, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) @@ -1125,7 +1040,6 @@ u8 func0007_alerted[] = { label(LABEL_GETGUN_FAILED) stop_chr - dprint 'G','E','T','G','U','N',' ','F','A','I','L','E','D','\n',0, call_rng if_rand_lt(50, /*goto*/ 0xe6) if_rand_lt(100, /*goto*/ LABEL_DRAW_PISTOL) @@ -1193,10 +1107,8 @@ u8 func0007_alerted[] = { label(0x13) if_self_flag_bankx_eq(CHRFLAG1_HANDCOMBATONLY, TRUE, BANK_1, /*goto*/ LABEL_TRACK) - dprint 'C','H','E','C','K','I','N','J','U','R','Y','E','N','D','\n',0, // Consider warning others in team - dprint 'B','4',' ','T','E','A','M',' ','C','H','E','C','K','\n',0, if_alarm_active(/*goto*/ 0x16) if_chr_in_squadron_doing_action(MA_GOTOALARM, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG0_ACTIVATEALARM, TRUE, BANK_0, /*goto*/ LABEL_RUN_FOR_ALARM) @@ -1233,21 +1145,17 @@ u8 func0007_alerted[] = { label(0x93) if_self_flag_bankx_eq(CHRFLAG0_CANT_ALERT_GROUP, TRUE, BANK_0, /*goto*/ LABEL_RETREAT) if_self_flag_bankx_eq(CHRFLAG0_CAN_TRAP, TRUE, BANK_0, /*goto*/ 0x13) - dprint 'T','R','A','P',' ','N','O','T',' ','S','E','T','\n',0, if_self_flag_bankx_eq(CHRFLAG0_GP1, FALSE, BANK_0, /*goto*/ 0x16) label(0x13) - dprint 'V','I','S','\n',0, if_can_see_attack_target(/*goto*/ 0x16) goto_next(0x98) label(0x16) - dprint 'T','R','A','P',' ','F','A','I','L','E','D','\n',0, if_self_flag_bankx_eq(CHRFLAG0_SAID_AMBUSH_QUIP, TRUE, BANK_0, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG0_NOACCURACYAFTERJAM, FALSE, BANK_0, /*goto*/ 0x16) label(0x13) - dprint 'V','I','S','\n',0, if_can_see_attack_target(/*goto*/ 0x16) goto_next(0xa1) @@ -1255,7 +1163,6 @@ u8 func0007_alerted[] = { if_self_flag_bankx_eq(CHRFLAG0_CAMP, FALSE, BANK_0, /*goto*/ 0x16) label(0x13) - dprint 'I','M',' ','G','O','I','N','G',' ','T','O',' ','P','O','P','\n',0, goto_next(0xa4) // Not popping @@ -1263,15 +1170,12 @@ u8 func0007_alerted[] = { if_self_flag_bankx_eq(CHRFLAG1_CAN_SNIPE, FALSE, BANK_1, /*goto*/ 0x16) label(0x13) - dprint 'I','M',' ','G','O','I','N','G',' ','T','O',' ','S','N','I','P','E','\n',0, goto_next(LABEL_SNIPE) label(0x16) - dprint 'A','M','B','U','S','H',' ','F','A','I','L','E','D','\n',0, if_self_flag_bankx_eq(CHRFLAG0_CAN_RETREAT, FALSE, BANK_0, /*goto*/ 0x16) if_num_times_shot_lt(1, /*goto*/ 0x16) if_calculated_safety2_lt(3, /*goto*/ LABEL_RETREAT) - dprint 'R','I','S','K',' ','F','A','I','L','E','D','\n',0, label(0x16) if_self_flag_bankx_eq(CHRFLAG0_FORCESAFETYCHECKS, TRUE, BANK_0, /*goto*/ 0x91) @@ -1288,7 +1192,6 @@ u8 func0007_alerted[] = { **************************************************************************/ label(0x98) - dprint 'G','O','I','N','G',' ','T','O',' ','T','R','A','P',' ','P','A','D','\n',0, go_to_target_pad(GOPOSFLAG_JOG) beginloop(0x99) @@ -1297,7 +1200,6 @@ u8 func0007_alerted[] = { endloop(0x99) label(0x16) - dprint 'A','T',' ','T','R','A','P',' ','P','A','D','\n',0, label(0x9b) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_CLOAKED, /*goto*/ LABEL_TARGETCLOAKED) @@ -1345,11 +1247,8 @@ u8 func0007_alerted[] = { #if VERSION >= VERSION_NTSC_1_0 beginloop(0xa2) - dprint 'W','A','I','T',' ','F','O','R',' ','A','M','B','\n',0, if_can_see_attack_target(/*goto*/ 0xa3) - dprint 'A','M','B','1','\n',0, if_distance_from_target_to_pad_lt(200, PAD_PRESET, /*goto*/ 0x13) - dprint 'A','M','B','2','\n',0, chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) if_enemy_distance_lt_and_los(1200, /*goto*/ 0xee) @@ -1361,7 +1260,6 @@ u8 func0007_alerted[] = { set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) #else beginloop(0xa2) - dprint 'W','A','I','T',' ','F','O','R',' ','A','M','B','\n',0, if_can_see_attack_target(/*goto*/ 0xa3) if_distance_from_target_to_pad_lt(200, PAD_PRESET, /*goto*/ 0x13) if_chr_target_eq(CHR_SELF, CHR_P1P2, FALSE, /*goto*/ 0xee) @@ -1383,7 +1281,6 @@ u8 func0007_alerted[] = { #endif label(0x13) - dprint 'A','M','B','U','S','H',' ','P','L','A','Y','E','R','\n',0, set_accuracy(30) set_self_flag_bankx(CHRFLAG0_SAID_AMBUSH_QUIP, BANK_0) say_quip(CHR_BOND, QUIP_ATTACK2, 0x50, 0x02, 0x01, BANK_0, 0x00, 0x00) @@ -1391,7 +1288,6 @@ u8 func0007_alerted[] = { label(0xa3) #if VERSION >= VERSION_NTSC_1_0 - dprint 'S','E','E','N','T','A','R','G','\n',0, // seen target #endif unset_self_flag_bankx(CHRFLAG0_NOACCURACYAFTERJAM, BANK_0) goto_first(LABEL_MAINLOOP) @@ -1403,11 +1299,9 @@ u8 func0007_alerted[] = { label(0xa4) if_self_flag_bankx_eq(CHRFLAG0_SKIPSAFETYCHECKS, TRUE, BANK_0, /*goto*/ 0xa8) find_cover(COVERCRITERIA_0001 | COVERCRITERIA_DISTTOME | COVERCRITERIA_FORCENEWCOVER | COVERCRITERIA_0020 | COVERCRITERIA_ALLOWNEIGHBOURINGROOMS | COVERCRITERIA_2000 | COVERCRITERIA_ALLOWSOFT, /*goto*/ 0xa5) - dprint 'P','O','P','P','E','R',' ','F','A','I','L','E','D','\n',0, goto_next(0x52) label(0xa5) - dprint 'G','O',' ','T','O',' ','P','O','P','P','E','R','\n',0, set_action(MA_COVERGOTO, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -1420,7 +1314,6 @@ u8 func0007_alerted[] = { endloop(0xa6) label(0xa7) - dprint 'U','N','D','E','R',' ','P','O','P','P','E','R','\n',0, label(0xa8) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_CLOAKED, /*goto*/ LABEL_TARGETCLOAKED) @@ -1554,10 +1447,8 @@ u8 func0007_alerted[] = { restart_timer set_accuracy(100) try_attack_lie(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0xe0) - dprint 'S','N','I','P','E','R',' ','N','O',' ','S','H','O','O','T','\n',0, beginloop(0xe0) - dprint 'S','N','I','P','E','R',' ',' ','S','H','O','O','T','\n',0, if_chr_stopped(/*goto*/ 0x13) endloop(0xe0) @@ -1585,12 +1476,10 @@ u8 func0007_alerted[] = { **************************************************************************/ label(0x52) - dprint 'A','M','B','U','S','H',' ','F','A','I','L','E','D','3','\n',0, if_within_targets_fovx_by_angle(60, /*goto*/ 0x16) goto_next(0x68) label(0x16) - dprint 'A','M','B','U','S','H',' ','F','A','I','L','E','D','4','\n',0, if_self_flag_bankx_eq(CHRFLAG0_UNDERCOVER, TRUE, BANK_0, /*goto*/ 0x16) goto_next(LABEL_COVERINVALID) @@ -1613,14 +1502,12 @@ u8 func0007_alerted[] = { if_distance_to_target_gt(4000, /*goto*/ 0x61) label(0x16) - dprint 'O','K','F','O','R','C','O','V','E','R','\n',0, if_can_see_attack_target(/*goto*/ LABEL_COVERINVALID) if_nearly_in_targets_sight(30, /*goto*/ LABEL_COVERINVALID) if_chr_in_view(/*goto*/ LABEL_COVERINVALID) goto_next(0x56) label(LABEL_COVERINVALID) - dprint 'C','O','V','E','R',' ','I','N','V','A','L','I','D','\n',0, if_self_flag_bankx_eq(CHRFLAG1_ALLOWSOFTCOVER, TRUE, BANK_1, /*goto*/ 0x15) if_self_flag_bankx_eq(CHRFLAG0_COVER_TYPE1, TRUE, BANK_0, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG0_COVER_TYPE2, FALSE, BANK_0, /*goto*/ 0x5c) @@ -1636,7 +1523,6 @@ u8 func0007_alerted[] = { goto_next(0x14) label(0x15) - dprint 'S','O','F','T',' ','C','O','V','E','R','\n',0, if_self_flag_bankx_eq(CHRFLAG0_COVER_TYPE1, TRUE, BANK_0, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG0_COVER_TYPE2, FALSE, BANK_0, /*goto*/ 0x5c) find_cover(COVERCRITERIA_0001 | COVERCRITERIA_DISTTOME | COVERCRITERIA_FORCENEWCOVER | COVERCRITERIA_0020 | COVERCRITERIA_ALLOWNEIGHBOURINGROOMS | COVERCRITERIA_1000 | COVERCRITERIA_ALLOWSOFT, /*goto*/ 0x53) @@ -1654,7 +1540,6 @@ u8 func0007_alerted[] = { goto_next(0x54) label(0x53) - dprint 'G','O',' ','T','O',' ','C','O','V','E','R','\n',0, set_action(MA_COVERGOTO, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -1691,7 +1576,6 @@ u8 func0007_alerted[] = { label(0x56) set_self_flag_bankx(CHRFLAG0_UNDERCOVER, BANK_0) - dprint 'U','N','D','E','R',' ','C','O','V','E','R','\n',0, label(0x58) set_chrpreset(CHR_TARGET) @@ -1717,7 +1601,6 @@ u8 func0007_alerted[] = { label(0x61) set_target_chr(CHR_PRESET) - dprint 'B','R','E','A','K',' ','C','O','V','E','R','\n',0, if_self_flag_bankx_eq(CHRFLAG0_00008000, TRUE, BANK_0, /*goto*/ 0x66) label(0x16) @@ -1776,12 +1659,10 @@ u8 func0007_alerted[] = { stop_chr yield if_dangerous_object_nearby(3, /*goto*/ LABEL_FLEE_GRENADE) - dprint 'B','A','C','K',' ','T','O',' ','C','O','V','E','R','\n',0, goto_first(0x52) label(0x5f) cmd012f - dprint 'S','E','E','C','O','V','E','R','\n',0, set_action(MA_COVERSEEN, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -1923,14 +1804,12 @@ u8 func0007_alerted[] = { goto_first(LABEL_MAINLOOP) label(0x54) - dprint 'N','O',' ','C','O','V','E','R','A','V','A','I','L','A','B','L','E','\n',0, label(0x68) if_can_see_attack_target(/*goto*/ 0x24) goto_next(0x25) label(0x25) - dprint 'H','E','C','A','N','T',' ','S','E','E',' ','M','E','\n',0, goto_next(0x2f) label(0x24) @@ -1962,11 +1841,9 @@ u8 func0007_alerted[] = { if_rand_lt(128, /*goto*/ 0x32) label(0x31) - dprint 'F','L','A','N','K','\n',0, label(0x16) label(0x13) - dprint 'F','L','A','N','K',' ','B','E','S','T','\n',0, unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) cmd0139(25, 0x02, TRUE) if_self_flag_bankx_eq(CHRFLAG0_CAN_FLANK, FALSE, BANK_0, /*goto*/ 0x16) @@ -1977,7 +1854,6 @@ u8 func0007_alerted[] = { goto_next(0x33) label(LABEL_FLANK_LEFT) - dprint 'F','L','A','N','K',' ','L','E','F','T','\n',0, set_action(MA_FLANKLEFT, FALSE) cmd0139(335, 0x02, FALSE) if_self_flag_bankx_eq(CHRFLAG0_CAN_FLANK, FALSE, BANK_0, /*goto*/ 0x16) @@ -1987,7 +1863,6 @@ u8 func0007_alerted[] = { goto_next(0x33) label(LABEL_FLANK_RIGHT) - dprint 'F','L','A','N','K',' ','R','I','G','H','T','\n',0, set_action(MA_FLANKRIGHT, FALSE) if_self_flag_bankx_eq(CHRFLAG0_CAN_FLANK, FALSE, BANK_0, /*goto*/ 0x16) set_team_orders(MA_FLANKRIGHT, /*goto*/ 0x16) @@ -2039,10 +1914,8 @@ u8 func0007_alerted[] = { if_chr_in_view(/*goto*/ LABEL_DODGE) label(0x2f) - dprint 'C',' ','1','\n',0, if_distance_to_target_gt(1300, /*goto*/ LABEL_TRACK) if_can_see_attack_target(/*goto*/ 0x26) - dprint 'C',' ','2','\n',0, if_self_flag_bankx_eq(CHRFLAG0_CAN_RETREAT, FALSE, BANK_0, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG0_CANT_ALERT_GROUP, TRUE, BANK_0, /*goto*/ LABEL_RETREAT) if_num_times_shot_lt(1, /*goto*/ 0x16) @@ -2056,7 +1929,6 @@ u8 func0007_alerted[] = { if_calculated_safety2_lt(5, /*goto*/ 0x51) label(0x4d) - dprint 'C',' ','3','\n',0, if_self_flag_bankx_eq(CHRFLAG0_00008000, TRUE, BANK_0, /*goto*/ LABEL_THROWGRENADE) goto_next(LABEL_TRACK) @@ -2069,13 +1941,11 @@ u8 func0007_alerted[] = { **************************************************************************/ label(0x16) - dprint 'C',' ','4','\n',0, kneel yield if_dangerous_object_nearby(3, /*goto*/ LABEL_FLEE_GRENADE) label(LABEL_THROWGRENADE) - dprint 'G','R','E','N','A','D','E','P','\n',0, set_grenade_probability_out_of_255(255) label(0x16) @@ -2084,17 +1954,14 @@ u8 func0007_alerted[] = { label(0x16) if_distance_to_target_lt(500, /*goto*/ 0x4c) - dprint 'G','R','E','N','A','D','E','\n',0, restart_timer if_chr_in_squadron_doing_action(MA_GRENADE, /*goto*/ 0x4c) - dprint 'A','C','T','I','O','N',' ','G','R','E','N','A','D','E','\n',0, set_action(MA_GRENADE, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) consider_throwing_grenade(0x0200, 0x0000, /*goto*/ 0x46) goto_next(0x4c) - dprint 'G','R','E','N','A','D','E','F','A','I','L','\n',0, beginloop(0x46) if_chr_stopped(/*goto*/ 0x16) @@ -2111,7 +1978,6 @@ u8 func0007_alerted[] = { label(0x4a) if_timer_lt(60, /*goto*/ 0x49) - dprint 'G','R','E','N','A','D','E','S','T','O','P','\n',0, set_action(MA_GRENADEWAIT, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -2146,7 +2012,6 @@ u8 func0007_alerted[] = { label(0x49) label(0x4c) restart_timer - dprint 'W','A','I','T','I','N','G','\n',0, set_action(MA_WAITING, TRUE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -2193,16 +2058,13 @@ u8 func0007_alerted[] = { endloop(0x40) label(0x42) - dprint 'S','E','E','W','A','I','T','\n',0, set_action(MA_WAITSEEN, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) - dprint 'S','E','E','W','A','I','T','2','\n',0, if_self_flag_bankx_eq(CHRFLAG0_CAN_FLANK, FALSE, BANK_0, /*goto*/ 0x16) set_team_orders(MA_WAITSEEN, /*goto*/ 0x16) label(0x16) - dprint 'S','E','E','W','A','I','T','3','\n',0, if_can_see_attack_target(/*goto*/ 0x8a) restart_timer try_run_to_target(/*goto*/ 0x89) @@ -2339,7 +2201,6 @@ u8 func0007_alerted[] = { **************************************************************************/ label(0x8b) - dprint 'B','A','C','K','O','F','F','\n',0, if_within_targets_fovx_by_angle(20, /*goto*/ 0x13) goto_next(0x50) @@ -2401,7 +2262,6 @@ u8 func0007_alerted[] = { **************************************************************************/ label(LABEL_WAITTIMEOUT) - dprint 'W','A','I','T','T','I','M','E','O','U','T','\n',0, if_self_flag_bankx_eq(CHRFLAG0_CAN_TRAP, FALSE, BANK_0, /*goto*/ 0x13) goto_first(LABEL_MAINLOOP) @@ -2416,7 +2276,6 @@ u8 func0007_alerted[] = { goto_next(0x3f) // Unreachable - no label - dprint 'W','A','I','T','M','O','V','E','\n',0, try_run_sideways(/*goto*/ 0x3e) beginloop(0x3e) @@ -2436,7 +2295,6 @@ u8 func0007_alerted[] = { label(LABEL_TRACK) set_chrpreset(CHR_TARGET) - dprint 'T','R','A','C','K','\n',0, set_action(MA_TRACKING, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -2485,7 +2343,6 @@ u8 func0007_alerted[] = { if_can_see_attack_target(/*goto*/ 0x26) label(0x13) - dprint 'N','O','S','E','E','P','L','A','Y','E','R','\n',0, if_self_flag_bankx_eq(CHRFLAG0_AIVSAI, FALSE, BANK_0, /*goto*/ 0x13) if_enemy_distance_lt_and_los(2540, /*goto*/ 0x16) goto_next(0x13) @@ -2527,7 +2384,6 @@ u8 func0007_alerted[] = { goto_next(0x3c) label(0x3c) - dprint 'N','O','A','N','G','\n',0, label(0x17) if_chr_stopped(/*goto*/ 0x13) @@ -2535,13 +2391,11 @@ u8 func0007_alerted[] = { endloop(0x35) label(0x13) - dprint 'C','O','M','P','L','E','T','E','D','\n',0, set_target_chr(CHR_PRESET) goto_first(0xf7) label(0x36) set_target_chr(CHR_PRESET) - dprint 'E','N','D',' ','T','R','A','C','K','\n',0, set_alertness(0) set_returnlist(CHR_SELF, GAILIST_ALERTED) set_ailist(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER) @@ -2558,7 +2412,6 @@ u8 func0007_alerted[] = { **************************************************************************/ label(0x87) - dprint 'S','Y','N','C',' ','S','H','O','O','T','\n',0, cmd012f set_action(MA_SHOOTING, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) @@ -2593,7 +2446,6 @@ u8 func0007_alerted[] = { goto_first(LABEL_MAINLOOP) label(0x26) - dprint 'I','C','A','N','S','E',' ','P','L','A','Y','E','R','\n',0, if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_CLOAKED, /*goto*/ LABEL_TARGETCLOAKED) if_self_flag_bankx_eq(CHRFLAG1_NOHANDCOMBAT, TRUE, BANK_1, /*goto*/ 0x13) if_self_flag_bankx_eq(CHRFLAG1_HANDCOMBATONLY, TRUE, BANK_1, /*goto*/ 0x16) @@ -2611,7 +2463,6 @@ u8 func0007_alerted[] = { set_ailist(CHR_SELF, GAILIST_HAND_COMBAT) label(0x13) - dprint 't','a','r','g','e','t','\n',0, restart_timer stop_chr set_action(MA_SHOOTING, FALSE) @@ -2656,7 +2507,6 @@ u8 func0007_alerted[] = { label(0x8c) try_attack_stand(ATTACKFLAG_AIMATTARGET | ATTACKFLAG_AIMONLY, 0, /*goto*/ 0x28) - dprint 'S','H','O','O','T','F','A','I','L','E','D','\n',0, yield if_dangerous_object_nearby(3, /*goto*/ LABEL_FLEE_GRENADE) goto_first(0x8b) @@ -2720,11 +2570,9 @@ u8 func0007_alerted[] = { endloop(0xea) label(0x13) - dprint 'L','E','F','T','S','H','O','O','T','\n',0, goto_first(0x8b) label(0x67) - dprint 'S','H','O','T','N','O','W','O','R','K','\n',0, label(0x2b) goto_first(0x8b) @@ -2734,7 +2582,6 @@ u8 func0007_alerted[] = { **************************************************************************/ label(LABEL_DODGE) - dprint 'D','o','d','g','e','\n',0, set_action(MA_DODGE, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) set_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -2760,7 +2607,6 @@ u8 func0007_alerted[] = { endloop(0x2c) label(0x2e) - dprint 'D','O','D','G','E',' ','D','O','N','E','\n',0, call_rng if_rand_lt(128, /*goto*/ 0x16) goto_first(0x87) @@ -2775,7 +2621,6 @@ u8 func0007_alerted[] = { label(LABEL_RETREAT) set_chr_dodge_rating(0, 0) set_chr_dodge_rating(1, 0) - dprint 'R','O','U','T','E','D','\n',0, set_action(MA_RETREAT, FALSE) unset_self_flag_bankx(CHRFLAG1_FLANKED, BANK_1) unset_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) @@ -2790,7 +2635,6 @@ u8 func0007_alerted[] = { goto_first(LABEL_MAINLOOP) label(0x16) - dprint 'R','U','N','N','I','N','G','\n',0, set_target_chr(CHR_P1P2) retreat(2, 1) @@ -2872,7 +2716,6 @@ u8 func0007_alerted[] = { endloop(0x96) label(0x97) - dprint 'W','A','R','N',' ','F','R','I','E','N','D','S','\n',0, say_quip(CHR_BOND, QUIP_WARNFRIENDS, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00) increase_squadron_alertness(100) @@ -2991,27 +2834,23 @@ u8 func000a_do_busy_animation[] = { // Standing and operating something label(0x03) - dprint 'S','T','A','N','D','I','N','G','\n',0, chr_do_animation(ANIM_OPERATE_0204, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) goto_next(0x0c) // Sitting and typing label(0x04) - dprint 'S','I','T','T','I','N','G',' ','T','Y','P','I','N','G','\n',0, set_chr_special_death_animation(CHR_SELF, SPECIALDIE_ONCHAIR) chr_do_animation(ANIM_SITTING_TYPING, 0, -1, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 0, CHR_SELF, 2) goto_next(0x0c) // Sitting dormantly label(0x05) - dprint 'S','I','T','T','I','N','G','\n',0, set_chr_special_death_animation(CHR_SELF, SPECIALDIE_ONCHAIR) chr_do_animation(ANIM_SITTING_DORMANT, 0, -1, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 0, CHR_SELF, 2) goto_next(0x0c) // Operating something with a pad label(0x07) - dprint 'N','A','T',' ','5','\n',0, restart_timer try_face_entity(ATTACKFLAG_AIMATPAD, PAD_PRESET, /*goto*/ 0xfa) @@ -3021,7 +2860,6 @@ u8 func000a_do_busy_animation[] = { // Operating something without a pad label(0x06) - dprint 'O','P','E','R','A','T','I','N','G','\n',0, call_rng if_rand_gt(85, /*goto*/ 0x28) if_rand_gt(170, /*goto*/ 0x29) @@ -3106,9 +2944,7 @@ u8 func000b_choose_target_chr[] = { label(0x16) say_quip(CHR_BOND, QUIP_SHOTUNALERT, 0xff, 0x03, 0x00, BANK_0, 0x00, 0x00) - dprint 'N','O',' ','W','A','R','N','I','N','G','\n',0, increase_squadron_alertness(100) - dprint 'N','O',' ','W','A','R','N','I','N','G','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x13) goto_next(0xd3) @@ -3119,7 +2955,6 @@ u8 func000b_choose_target_chr[] = { label(0xd3) set_action(MA_NORMAL, FALSE) yield - dprint 'S','C','A','N','\n',0, if_self_flag_bankx_eq(CHRFLAG0_NOHEAR, TRUE, BANK_0, /*goto*/ 0x13) set_target_to_enemy_on_same_floor(/*goto*/ 0x16) @@ -3137,7 +2972,6 @@ u8 func000b_choose_target_chr[] = { // Found label(0x16) - dprint 'F','O','U','N','D','\n',0, increase_squadron_alertness(100) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -3145,7 +2979,6 @@ u8 func000b_choose_target_chr[] = { set_returnlist(CHR_SELF, GAILIST_CHOOSE_TARGET) label(0x13) - dprint 'F','O','U','N','D','A','L','E','R','T','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x13) if_self_flag_bankx_eq(CHRFLAG0_NOHEAR, TRUE, BANK_0, /*goto*/ 0x16) set_target_to_enemy_on_same_floor(/*goto*/ 0x13) @@ -3197,7 +3030,6 @@ u8 func000d_init_combat[] = { */ u8 func000c_combat_with_target_chr[] = { if_chr_is_skedar(CHR_SELF, /*goto*/ 0x16) - dprint 'S','E','E',' ','E','N','E','M','Y','\n',0, #if VERSION >= VERSION_NTSC_1_0 if_num_human_players_lt(2, /*goto*/ 0x16) @@ -3267,7 +3099,6 @@ u8 func000c_combat_with_target_chr[] = { // Or follow through if chr still has target label(0x16) set_self_chrflag(CHRCFLAG_00000040) - dprint 'D','E','T','E','C','T','\n',0, if_chr_dead(CHR_SELF, /*goto*/ 0x16) if_chr_death_animation_finished(CHR_SELF, /*goto*/ 0x16) if_chr_knockedout(CHR_SELF, /*goto*/ 0x16) @@ -3296,7 +3127,6 @@ u8 func000c_combat_with_target_chr[] = { // Alive label(0x13) - dprint 'D','E','T','E','C','T','1','\n',0, if_num_times_shot_lt(1, /*goto*/ 0xb2) if_just_injured(CHR_SELF, /*goto*/ 0x16) #if VERSION >= VERSION_NTSC_1_0 @@ -3305,7 +3135,6 @@ u8 func000c_combat_with_target_chr[] = { #endif goto_next(0xb2) - dprint 'D','E','T','E','C','T','2','\n',0, // Injured label(0x16) @@ -3327,7 +3156,6 @@ u8 func000c_combat_with_target_chr[] = { endloop(0x1d) label(0x13) - dprint 'D','E','T','E','C','T','3','\n',0, // Chrs can have CHRHFLAG_DONTSHOOTME, which I think is used for coop. // If an enemy has this flag, the AI buddy will not shoot the chr but will @@ -3345,9 +3173,7 @@ u8 func000c_combat_with_target_chr[] = { set_self_flag_bankx(CHRFLAG1_HANDCOMBATONLY, BANK_1) label(0x16) - dprint 'T','E','A','M','D','\n',0, if_alertness(100, OPERATOR_LESS_THAN, /*goto*/ 0xb3) - dprint 'A','L','E','R','T','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0xb3) if_chr_is_skedar(CHR_SELF, /*goto*/ 0x16) if_chr_has_hiddenflag(CHR_SELF, CHRHFLAG_PSYCHOSISED, /*goto*/ 0x13) @@ -3357,7 +3183,6 @@ u8 func000c_combat_with_target_chr[] = { if_chrpresets_target_is_different(/*goto*/ 0xb3) label(0x16) - dprint 'N','O',' ','T','A','R','G','E','T','\n',0, set_target_chr(-1) return @@ -3423,7 +3248,6 @@ u8 func000c_combat_with_target_chr[] = { set_ailist(CHR_SELF, GAILIST_ALERTED) label(0x16) - dprint 'F','O','U','N','D',' ','E','N','E','M','Y','\n',0, restart_timer if_chr_dead(CHR_TARGET, /*goto*/ 0xba) if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0xba) @@ -3447,10 +3271,8 @@ u8 func000c_combat_with_target_chr[] = { label(0x16) try_run_to_target(/*goto*/ 0xb4) - dprint 'R','U','N',' ','F','A','I','L','\n',0, beginloop(0xb4) - dprint 'F','O','U','N','D',' ','1','\n',0, if_timer_gt(600, /*goto*/ 0xba) if_self_flag_bankx_eq(CHRFLAG1_HANDCOMBATONLY, FALSE, BANK_1, /*goto*/ 0x13) if_timer_gt(20, /*goto*/ 0x09) @@ -3463,7 +3285,6 @@ u8 func000c_combat_with_target_chr[] = { goto_next(0xba) label(0x13) - dprint 'F','O','U','N','D',' ','2','\n',0, if_self_flag_bankx_eq(CHRFLAG1_HANDCOMBATONLY, TRUE, BANK_1, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG1_NOHANDCOMBAT, TRUE, BANK_1, /*goto*/ 0x13) if_distance_to_target_lt(120, /*goto*/ 0x16) @@ -3473,11 +3294,9 @@ u8 func000c_combat_with_target_chr[] = { label(0x16) if_can_see_attack_target(/*goto*/ 0x16) - dprint 'N','O','U','N','A','R','M','\n',0, goto_next(0x13) label(0x16) - dprint 'G','O','U','N','A','R','M','\n',0, set_self_flag_bankx(CHRFLAG1_PUNCH_THEN_GENERAL_COMBAT, BANK_1) set_ailist(CHR_SELF, GAILIST_HAND_COMBAT) @@ -3542,7 +3361,6 @@ u8 func000c_combat_with_target_chr[] = { goto_next(0xc1) label(0x13) - dprint 'S','H','O','O','T','I','N','G','\n',0, goto_next(0xc2) label(0x16) @@ -3551,7 +3369,6 @@ u8 func000c_combat_with_target_chr[] = { // @bug: Guards will consider throwing grenades if you're moving quickly // rather than slowly. The below statement skips the grenade logic if slow. if_target_moving_slowly(0, /*goto*/ 0xc2) - dprint 'G','R','E','N','A','D','E','\n',0, restart_timer if_chr_in_squadron_doing_action(MA_GRENADE, /*goto*/ 0xc2) set_action(MA_GRENADE, FALSE) @@ -3575,7 +3392,6 @@ u8 func000c_combat_with_target_chr[] = { label(0x13) yield - dprint 'G','R','E','N','A','D','E',' ','E','N','D','\n',0, label(0xc2) if_self_flag_bankx_eq(CHRFLAG1_NOHANDCOMBAT, TRUE, BANK_1, /*goto*/ 0x13) @@ -3595,7 +3411,6 @@ u8 func000c_combat_with_target_chr[] = { label(0x13) label(0x13) - dprint 'C','H','O','S','E',' ','S','H','T','N','D','\n',0, // chose shoot call_rng if_rand_gt(64, /*goto*/ 0x16) if_self_flag_bankx_eq(CHRFLAG1_CAN_ATTACKAMOUNTRELOAD, FALSE, BANK_1, /*goto*/ 0x13) @@ -3668,7 +3483,6 @@ u8 func000c_combat_with_target_chr[] = { label(0x13) restart_timer - dprint 'S','H','O','O','T',' ','F','A','I','L','\n',0, beginloop(0x03) if_timer_gt(60, /*goto*/ 0x16) @@ -3678,22 +3492,18 @@ u8 func000c_combat_with_target_chr[] = { goto_first(0xc3) label(0xba) - dprint 'F','O','U','N','D',' ','3','\n',0, label(0xc1) if_chr_injured_target(CHR_SELF, /*goto*/ 0x13) - dprint 'P','U','N','C','H','M','I','S','S','E','D','\n',0, say_quip(CHR_BOND, QUIP_MISSEDPLAYER1, 0x19, 0x03, 0xff, BANK_0, 0x00, 0x00) say_quip(CHR_BOND, QUIP_MISSEDPLAYER2, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00) goto_next(0x16) label(0x13) - dprint 'P','U','N','C','H','H','I','T','\n',0, say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x02, 0xff, BANK_0, 0x00, 0x00) say_quip(CHR_BOND, QUIP_HITPLAYER, 0x19, 0x03, 0x01, BANK_0, 0x00, 0x00) label(0x16) - dprint 'B','O','N','N','D',' ','3','\n',0, if_self_flag_bankx_eq(CHRFLAG1_PUNCHAIEXTRADAMAGE, FALSE, BANK_1, /*goto*/ 0x13) if_target_is_player(/*goto*/ 0x13) damage_chr(CHR_TARGET, WEAPON_SUPERDRAGON) @@ -3715,7 +3525,6 @@ u8 func000c_combat_with_target_chr[] = { goto_first(0xb3) label(0x13) - dprint 'L','O','O','K',' ','F','O','R',' ','C','O','V','E','R','\n',0, if_self_flag_bankx_eq(CHRFLAG1_ALLOWSOFTCOVER, TRUE, BANK_1, /*goto*/ 0x15) find_cover(COVERCRITERIA_0001 | COVERCRITERIA_DISTTOME | COVERCRITERIA_FORCENEWCOVER | COVERCRITERIA_0020 | COVERCRITERIA_1000, /*goto*/ 0x53) find_cover(COVERCRITERIA_0001 | COVERCRITERIA_DISTTOME | COVERCRITERIA_FORCENEWCOVER | COVERCRITERIA_ALLOWNEIGHBOURINGROOMS | COVERCRITERIA_1000, /*goto*/ 0x53) @@ -3729,7 +3538,6 @@ u8 func000c_combat_with_target_chr[] = { goto_next(0x54) label(0x53) - dprint 'G','O',' ','T','O',' ','C','O','V','E','R','\n',0, say_quip(CHR_BOND, QUIP_GOTOCOVER1, 0xff, 0x02, 0x01, BANK_0, 0x00, 0x00) go_to_cover(GOPOSFLAG_RUN) restart_timer @@ -3747,7 +3555,6 @@ u8 func000c_combat_with_target_chr[] = { goto_first(0xb5) label(0x16) - dprint 'G','O','T',' ','T','O',' ','C','O','V','E','R','\n',0, label(0xc8) restart_timer @@ -3783,13 +3590,11 @@ u8 func000c_combat_with_target_chr[] = { label(0x16) #if VERSION >= VERSION_NTSC_1_0 - dprint 'T','I','M','O','U','T','\n',0, #endif goto_first(0xb3) #if VERSION >= VERSION_NTSC_1_0 label(0x15) - dprint 'O','P','F','I','R','E','\n',0, #else label(0x13) #endif @@ -3801,7 +3606,6 @@ u8 func000c_combat_with_target_chr[] = { label(0xca) #if VERSION >= VERSION_NTSC_1_0 restart_timer - dprint 'T','A','R','S','H','O','\n',0, #endif if_chr_is_skedar(CHR_SELF, /*goto*/ 0x16) goto_next(0x17) @@ -3844,7 +3648,6 @@ u8 func000c_combat_with_target_chr[] = { #endif label(0x54) - dprint 'N','O','C','O','V','E','R','\n',0, goto_first(0xb3) restart_timer @@ -3859,9 +3662,7 @@ u8 func000c_combat_with_target_chr[] = { goto_first(0xb3) label(0xc5) - dprint 'F','O','U','N','D',' ','4','\n',0, if_self_flag_bankx_eq(CHRFLAG1_AIVSAI_ADVANTAGED, FALSE, BANK_1, /*goto*/ 0x13) - dprint 'F','O','U','N','D',' ','5','\n',0, return label(0x13) @@ -3874,7 +3675,6 @@ u8 func000c_combat_with_target_chr[] = { goto_next(0xcf) label(0x16) - dprint 'K','I','L','L','E','D',' ','T','A','R','G','E','T','\n',0, restart_timer call_rng if_self_flag_bankx_eq(CHRFLAG1_AIVSAI_ADVANTAGED, FALSE, BANK_1, /*goto*/ 0x13) @@ -3974,7 +3774,6 @@ u8 unregistered_function3[] = { endloop(0x19) label(0x16) - dprint 'f','i','n','y','a','w','n','\n',0, return endlist }; @@ -3986,7 +3785,6 @@ u8 unregistered_function3[] = { * Attack Ship. */ u8 func0000_idle_0009[] = { - dprint 'S','T','A','R','T',' ','L','I','S','T','\n',0, set_action(MA_NORMAL, FALSE) set_returnlist(CHR_SELF, GAILIST_IDLE_0009) stop_chr @@ -4311,13 +4109,10 @@ u8 func000f_hand_combat[] = { if_chr_knockedout(CHR_TARGET, /*goto*/ 0xfa) // This if-statement is effectively a no op - dprint 'L','1','\n',0, if_chrpresets_target_is_different(/*goto*/ 0x13) - dprint 'L','2','\n',0, label(0x13) - dprint 'L','O','O','K',' ','F','O','R',' ','T','A','R','G','E','T','\n',0, if_self_flag_bankx_eq(CHRFLAG1_HANDCOMBATONLY, TRUE, BANK_1, /*goto*/ 0x13) if_chr_is_skedar(CHR_SELF, /*goto*/ 0x0f) if_distance_to_target_gt(120, /*goto*/ 0x13) @@ -4347,7 +4142,6 @@ u8 func000f_hand_combat[] = { label(0x10) label(0xe3) restart_timer - dprint 'R','U','N',' ','T','O',' ','T','A','R','G','E','T','\n',0, try_run_to_target(/*goto*/ 0x03) beginloop(0x03) @@ -4405,7 +4199,6 @@ u8 func000f_hand_combat[] = { label(LABEL_FACE_TARGET) restart_timer - dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0, if_target_in_fov_left(10, /*goto*/ LABEL_PUNCH) if_target_out_of_fov_left(246, /*goto*/ LABEL_PUNCH) stop_chr @@ -4428,7 +4221,6 @@ u8 func000f_hand_combat[] = { goto_first(0x0c) label(LABEL_PUNCH) - dprint 'P','U','N','C','H','\n',0, try_punch_or_kick(/*goto*/ 0x13) // Unable to punch or kick for some reason - return to main loop @@ -4451,13 +4243,11 @@ u8 func000f_hand_combat[] = { label(0x16) if_chr_injured_target(CHR_SELF, /*goto*/ 0x13) - dprint 'P','U','N','C','H','M','I','S','S','E','D','\n',0, 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(0x16) label(0x13) - dprint 'P','U','N','C','H','H','I','T','\n',0, 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) @@ -4465,21 +4255,17 @@ u8 func000f_hand_combat[] = { goto_next(0x0b) label(0xfa) - dprint 'T','A','R','G','E','T',' ','I','S',' ','D','Y','I','N','G','\n',0, // Finished attack label(0x0b) - dprint 'F','U','N',' ',' ','H','I','T','\n',0, label(0x15) if_self_flag_bankx_eq(CHRFLAG1_PUNCH_THEN_GENERAL_COMBAT, TRUE, BANK_1, /*goto*/ 0x13) - dprint 'R','E','T',' ','H','H','I','T','\n',0, label(0x17) return label(0x13) - dprint 'D','E','T',' ','E','N','I','T','\n',0, set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) endlist }; @@ -4500,11 +4286,9 @@ u8 func0010_civilian_say_comment[] = { label(0x0c) yield - dprint 'L','O','O','K',' ','F','O','R',' ','T','A','R','G','E','T','\n',0, label(0x16) restart_timer - dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0, try_face_entity(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x04) // Wait until facing target, or a second has passed, or something else @@ -4526,7 +4310,6 @@ u8 func0010_civilian_say_comment[] = { label(0x16) label(0x16) set_self_flag_bankx(CHRFLAG1_TALKINGTODISGUISE, BANK_1) - dprint 'S','E','T',' ','D','I','S','S','P','E','E','\n',0, if_chr_weapon_equipped(CHR_TARGET, WEAPON_NONE, /*goto*/ 0x07) if_chr_weapon_equipped(CHR_TARGET, WEAPON_UNARMED, /*goto*/ 0x07) if_chr_weapon_equipped(CHR_TARGET, WEAPON_COMBATBOOST, /*goto*/ 0x07) @@ -4543,7 +4326,6 @@ u8 func0010_civilian_say_comment[] = { yield // Set a do-once flag, so chr is only stopped the first time - dprint 'R','E','T','\n',0, if_self_flag_bankx_eq(CHRFLAG1_TALKINGTODISGUISE, TRUE, BANK_1, /*goto*/ 0x13) stop_chr set_self_flag_bankx(CHRFLAG1_TALKINGTODISGUISE, BANK_1) @@ -4576,7 +4358,6 @@ u8 func0010_civilian_say_comment[] = { label(0x13) set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_ALMOSTUNCOVERED) - dprint 'D','O','N','T',' ','P','O','I','N','T','\n',0, say_quip(CHR_BOND, QUIP_ASKWEAPON2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) do_preset_animation(PRESETANIM_TALKRANDOM) restart_timer @@ -4598,7 +4379,6 @@ u8 func0010_civilian_say_comment[] = { label(0x0e) call_rng if_rand_gt(128, /*goto*/ 0x16) - dprint 'B','4','T','A','L','K','\n',0, if_stage_is_not(STAGE_CHICAGO, /*goto*/ 0x15) // will never pass // 50% chance of this happening @@ -4646,7 +4426,6 @@ u8 func001c_surprised[] = { // Wait 1 second beginloop(0x03) - dprint 'S','6',0, if_timer_gt(60, /*goto*/ 0x77) endloop(0x03) @@ -4661,13 +4440,11 @@ u8 func001c_surprised[] = { */ u8 func0011_flee_from_grenade[] = { set_action(MA_RUNFROMGRENADE, FALSE) - dprint 'N','E','A','R',' ','D','A','N','G','E','R','\n',0, run_from_grenade say_quip(CHR_BOND, QUIP_GRENADE1, 0xff, 0x00, 0xff, BANK_0, 0x00, 0x00) restart_timer beginloop(0x0c) - dprint 'D','A','N','G','E','R',' ','L','O','O','P','\n',0, if_dangerous_object_nearby(3, /*goto*/ 0x13) goto_next(0x16) @@ -4691,7 +4468,6 @@ u8 func001b_observe_camspy[] = { set_chrpreset(CHR_TARGET) if_just_injured(CHR_SELF, /*goto*/ 0x09) - dprint 'E','Y','E',' ','S','P','Y','\n',0, label(0x00) set_target_chr(CHR_PRESET) @@ -4784,32 +4560,24 @@ u8 func001b_observe_camspy[] = { endloop(0xc3) label(0x16) - dprint 'E','1','\n',0, if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x13) if_chr_dead(CHR_TARGET, /*goto*/ 0x13) if_chr_knockedout(CHR_TARGET, /*goto*/ 0x13) // Camspy still alive - dprint 'E','2','\n',0, if_can_see_target(/*goto*/ 0x16) - dprint 'E','3','\n',0, goto_next(0x13) // Unreachable - no label - dprint 'E','4','\n',0, if_chrpresets_target_is_different(/*goto*/ 0x16) - dprint 'E','5','\n',0, goto_next(0x13) label(0x16) - dprint 'E','6','\n',0, if_target_is_player(/*goto*/ 0x13) - dprint 'E','7','\n',0, goto_first(0x09) label(0x13) set_target_chr(CHR_BOND) - dprint 'E','8','\n',0, set_self_flag_bankx(CHRFLAG1_SEARCHSAMEROOM, BANK_1) set_ailist(CHR_SELF, GAILIST_SEARCH_FOR_PLAYER) endlist @@ -4835,7 +4603,6 @@ u8 func001d_search_for_player[] = { set_chr_special_death_animation(CHR_SELF, SPECIALDIE_NONE) label(0x13) - dprint 'S','E','A','R','C','H',' ','R','O','O','M','\n',0, set_chr_dodge_rating(2, 0) label(0x00) @@ -4850,7 +4617,6 @@ u8 func001d_search_for_player[] = { try_run_to_target(/*goto*/ 0x03) beginloop(0x03) - dprint 'S','E','A','R','C','H','I','N','I','T','\n',0, chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) if_target_in_sight(/*goto*/ 0x12) @@ -4866,7 +4632,6 @@ u8 func001d_search_for_player[] = { restart_timer beginloop(0x0a) - dprint 'P','O','I','N','T',' ','S','R','C','H','\n',0, if_self_flag_bankx_eq(CHRFLAG0_AIVSAI, FALSE, BANK_0, /*goto*/ 0x13) if_self_flag_bankx_eq(CHRFLAG1_INDARKROOM, TRUE, BANK_1, /*goto*/ 0x15) if_enemy_distance_lt_and_los(2540, /*goto*/ 0xc3) @@ -4944,7 +4709,6 @@ u8 func001d_search_for_player[] = { go_to_target_pad(GOPOSFLAG_WALK) beginloop(0x04) - dprint 'W','A','L','K',' ','P','A','D','\n',0, if_self_flag_bankx_eq(CHRFLAG0_AIVSAI, FALSE, BANK_0, /*goto*/ 0x13) if_enemy_distance_lt_and_los(2540, /*goto*/ 0xc3) @@ -4955,22 +4719,15 @@ u8 func001d_search_for_player[] = { label(0x13) chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) - dprint '1','\n',0, if_timer_gt(600, /*goto*/ 0x0b) - dprint '1','\n',0, if_chr_stopped(/*goto*/ 0x16) - dprint '1','\n',0, if_hears_target(/*goto*/ 0x12) - dprint '1','\n',0, if_alertness(99, OPERATOR_GREATER_THAN, /*goto*/ 0x12) - dprint '1','\n',0, if_near_miss(/*goto*/ 0x12) - dprint '1','\n',0, if_self_flag_bankx_eq(CHRFLAG1_INDARKROOM, FALSE, BANK_1, /*goto*/ 0x13) if_distance_to_target_gt(500, /*goto*/ 0x15) label(0x13) - dprint 'C','H','E','K',' ','V','I','S','\n',0, if_target_outside_my_yvisang(/*goto*/ 0x15) if_target_in_sight(/*goto*/ 0x12) @@ -4983,7 +4740,6 @@ u8 func001d_search_for_player[] = { // Saw death? label(0x28) - dprint 'E','Y','E',' ','S','P','Y','\n',0, label(0x12) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISED, /*goto*/ 0x13) @@ -4996,7 +4752,6 @@ u8 func001d_search_for_player[] = { label(0x16) set_alertness(100) - dprint 'S','E','E',' ','P','L','A','Y','\n',0, if_self_flag_bankx_eq(CHRFLAG1_INDARKROOM, FALSE, BANK_1, /*goto*/ 0x13) say_quip(CHR_BOND, QUIP_SEARCHSUCCESS, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) @@ -5027,7 +4782,6 @@ u8 func001d_search_for_player[] = { * @ailist GAILIST_RELATED_TO_SPAWNING */ u8 func001f_related_to_spawning[] = { - dprint 'S','E','E',' ','P','L','A','Y','\n',0, if_chr_dead(CHR_SELF, /*goto*/ 0x13) if_chr_death_animation_finished(CHR_SELF, /*goto*/ 0x13) if_chr_knockedout(CHR_SELF, /*goto*/ 0x13) @@ -5086,7 +4840,6 @@ u8 func001f_related_to_spawning[] = { goto_first(0x1a) label(0x1e) - dprint 'S','E','E',' ','D','E','T','E','C','T','\n',0, say_quip(CHR_BOND, QUIP_SEEPLAYER, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) label(0x9f) @@ -5137,7 +4890,6 @@ u8 func001f_related_to_spawning[] = { set_returnlist(CHR_SELF, GAILIST_RELATED_TO_SPAWNING) label(0x13) - dprint 'W','A','R','N','E','D','B','E','N','D','3','\n',0, set_returnlist(CHR_SELF, GAILIST_RELATED_TO_SPAWNING) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) endlist @@ -5287,7 +5039,6 @@ u8 func0013_init_pugilist_buddy[] = { u8 func0014_buddy_main[] = { set_returnlist(CHR_SELF, GAILIST_BUDDY_MAIN) set_shotlist(GAILIST_BUDDY_MAIN) - dprint 'B','A','C','K',' ','T','O',' ','B','U','D','D','Y','\n',0, unset_self_chrflag(CHRCFLAG_00040000) set_self_flag_bankx(CHRFLAG1_AIVSAI_ADVANTAGED, BANK_1) set_morale(0) @@ -5300,7 +5051,6 @@ u8 func0014_buddy_main[] = { // Dying label(0x13) - dprint 'B','U','D','D','Y',' ','D','I','E','\n',0, set_ailist(CHR_SELF, GAILIST_IDLE) // Alive @@ -5311,7 +5061,6 @@ u8 func0014_buddy_main[] = { // Injured label(0x13) say_quip(CHR_BOND, QUIP_INJURED2, 0xff, 0x14, 0xff, BANK_0, 0x00, 0x00) - dprint 'B','U','D','D','Y',' ','W','O','U','N','D','\n',0, beginloop(0xf2) if_chr_has_hiddenflag(CHR_BOND, CHRHFLAG_TRIGGER_BUDDY_WARP, /*goto*/ 0x13) @@ -5345,7 +5094,6 @@ u8 func0014_buddy_main[] = { // Start outer loop label(0x00) - dprint 'B','U','D','D','Y',' ','G','O',' ','T','O','W','A','R','D','S','\n',0, set_target_chr(CHR_BOND) restart_timer if_distance_to_target_gt(300, /*goto*/ 0x16) @@ -5389,7 +5137,6 @@ u8 func0014_buddy_main[] = { // Standing next to player label(0x16) - dprint 'B','U','D','D','Y',' ','S','T','A','N','D','\n',0, stop_chr beginloop(0x04) @@ -5434,7 +5181,6 @@ u8 func0014_buddy_main[] = { goto_first(0x00) label(0x03) - dprint 'D','E','T','E','C','T','E','D','\n',0, call_rng if_rand_lt(85, /*goto*/ 0xfa) if_rand_lt(170, /*goto*/ 0xf3) @@ -5492,7 +5238,6 @@ u8 func002b_avoid[] = { */ u8 func0022_comment_on_player_dead[] = { set_aishootingatmelist(GAILIST_IDLE) - dprint 'K','I','L','L','\n',0, stop_chr // Wait until player in sight. Which won't happen if the current chr is @@ -5516,7 +5261,6 @@ u8 func0022_comment_on_player_dead[] = { goto_first(0x03) label(0x16) - dprint 'K','I','L','L','E','D','E','R','\n',0, 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) @@ -5545,7 +5289,6 @@ u8 func0023_dodge[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x13) - dprint 'D','O','D','O','\n',0, set_self_flag_bankx(CHRFLAG1_DODGED, BANK_1) // 50% chance of hop vs jump @@ -6050,7 +5793,6 @@ u8 func0021_stop_and_idle[] = { * Also assigned upon respawn. */ u8 func0029_aibot_init[] = { - dprint 'l','i','s','t',':',' ','a','i','b','o','t','i','n','i','t',0, set_chr_maxdamage(CHR_SELF, 80) set_reaction_speed(100) set_returnlist(CHR_SELF, GAILIST_AIBOT_MAIN) @@ -6073,7 +5815,6 @@ u8 func0029_aibot_init[] = { * Assigned while the aibot is doing their death animation. Stops after fadeout. */ u8 func0028_aibot_dead[] = { - dprint 'l','i','s','t',':',' ','a','i','d','e','a','d',0, beginloop(0x0d) cmd0176_if_something(/*goto*/ 0x16) diff --git a/src/include/commands.h b/src/include/commands.h index dec492eae..57b7ad87e 100644 --- a/src/include/commands.h +++ b/src/include/commands.h @@ -1728,14 +1728,6 @@ srcchr, \ dstchr, -/** - * This command would have printed a message to the developer's console. - * - * It has no purpose in the retail game. - */ -#define dprint \ - mkshort(0x00b5), - /** * Resets the current chr's timer to zero and starts it. */ diff --git a/src/setups/setupame.c b/src/setups/setupame.c index 3987417c7..741bc19fd 100644 --- a/src/setups/setupame.c +++ b/src/setups/setupame.c @@ -1081,7 +1081,6 @@ u8 func0403_shielded_guard[] = { }; u8 func0404_init_hovercar[] = { - dprint 'h','o','v','\n',0, begin_hovercar_path(0) set_vehicle_speed(0x0c00, 120) @@ -1442,7 +1441,6 @@ u8 func0411_secretary[] = { set_self_flag_bankx(CHRFLAG0_SKIPSAFETYCHECKS, BANK_0) set_chr_hiddenflag(CHR_SECRETARY, CHRHFLAG_00100000) chr_move_to_pad(CHR_SECRETARY, PAD_AME_01C3, 0x00, /*goto*/ 0x2c) - dprint 'D','E','T','E','C','T',' ','4',0, label(0x2c) stop_chr label(0x06) @@ -3827,7 +3825,6 @@ u8 func042f_surrendering_guard[] = { // Wait 1 second beginloop(0x08) - dprint 'S','4',0, if_timer_gt(60, /*goto*/ 0x2c) endloop(0x08) @@ -3850,7 +3847,6 @@ 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, QUIP_WARNFRIENDS, 0xff, 0x02, 0xff, BANK_0, 0x00, 0x00) increase_squadron_alertness(100) diff --git a/src/setups/setupark.c b/src/setups/setupark.c index af7d84974..49e69d5d5 100644 --- a/src/setups/setupark.c +++ b/src/setups/setupark.c @@ -611,7 +611,6 @@ u8 func0401_drcaroll_following[] = { set_shield(100) set_chr_maxdamage(CHR_SELF, 100) label(0x20) - dprint 'b','4',' ','s','h','i','e','l','d',' ','c','h','e','c','k','\n',0, if_chr_shield_damaged(CHR_SELF, /*goto*/ 0x00) goto_next(0x02) @@ -633,7 +632,6 @@ u8 func0401_drcaroll_following[] = { beginloop(0x03) if_chr_y(CHR_TARGET, -1910, OPERATOR_LESS_THAN, /*goto*/ 0x20) label(0x20) - dprint 't','a','r','g','e','t','\n',0, if_can_see_target(/*goto*/ 0x00) goto_next(0x04) @@ -701,12 +699,10 @@ u8 func0401_drcaroll_following[] = { // Unreachable // Attempts to teleport Dr Caroll up the elevator shaft from foyer label(0x5c) - dprint 'D','R',' ','C','H','A','N','G','E','L','I','S','T','\n',0, if_chr_death_animation_finished(CHR_DRCAROLL, /*goto*/ 0x20) if_chr_dead(CHR_DRCAROLL, /*goto*/ 0x20) if_chr_knockedout(CHR_DRCAROLL, /*goto*/ 0x20) chr_move_to_pad(CHR_DRCAROLL, PAD_ARK_0079, 0x00, /*goto*/ 0x00) - dprint 'T','E','L','E','P','O','R','T',' ','F','A','I','L','\n',0, label(0x00) goto_first(0x02) @@ -728,10 +724,8 @@ u8 func0405_drcaroll_waiting[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x00) - dprint 'D','R',' ','C','H','A','N','G','E','L','I','S','T','\n',0, set_chr_hiddenflag(CHR_DRCAROLL, CHRHFLAG_00100000) chr_move_to_pad(CHR_DRCAROLL, PAD_ARK_01CA, 0x00, /*goto*/ 0x00) - dprint 'M','O','V','E',' ','F','A','I','L','\n',0, label(0x00) stop_chr @@ -1117,7 +1111,6 @@ u8 func0406_general_combat[] = { label(0x29) try_jog_to_target(/*goto*/ 0x20) label(0x20) - dprint 'U','N',' ','E','N','T','R','Y','\n',0, set_returnlist(CHR_SELF, AILIST_GENERAL_COMBAT) set_ailist(CHR_SELF, GAILIST_HAND_COMBAT) @@ -1157,7 +1150,6 @@ u8 func0408_hovercopter[] = { begin_hovercar_path(0x00) beginloop(0x22) - dprint 'L','O','W','\n',0, if_chr_y(CHR_TARGET, -1850, OPERATOR_LESS_THAN, /*goto*/ 0x00) if_chr_y(CHR_TARGET, -1200, OPERATOR_LESS_THAN, /*goto*/ 0x53) if_stage_flag_eq(STAGEFLAG_CHOPPER_GO_TO_ROOF, FALSE, /*goto*/ 0x00) @@ -1178,20 +1170,14 @@ u8 func0408_hovercopter[] = { begin_hovercar_path(0x01) beginloop(0x24) - dprint 'M','I','D','\n',0, if_chr_y(CHR_TARGET, -1850, OPERATOR_LESS_THAN, /*goto*/ 0x52) - dprint 'M','I','D','0','\n',0, if_chr_y(CHR_TARGET, -1200, OPERATOR_LESS_THAN, /*goto*/ 0x00) - dprint 'M','I','D','1','\n',0, if_stage_flag_eq(STAGEFLAG_CHOPPER_GO_TO_ROOF, FALSE, /*goto*/ 0x00) - dprint 'M','I','D','2','\n',0, goto_next(0x54) label(0x00) - dprint 'M','I','D','3','\n',0, set_target_chr(CHR_BOND) if_can_see_target(/*goto*/ 0x48) - dprint 'N','O','T','V','I','S','\n',0, if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0x20) set_target_chr(CHR_COOP) @@ -1210,7 +1196,6 @@ u8 func0408_hovercopter[] = { beginloop(0x26) set_target_chr(CHR_BOND) - dprint 'T','O','P','\n',0, if_chr_y(CHR_TARGET, -1850, OPERATOR_LESS_THAN, /*goto*/ 0x52) if_chr_y(CHR_TARGET, -1200, OPERATOR_LESS_THAN, /*goto*/ 0x53) set_target_chr(CHR_BOND) @@ -1225,7 +1210,6 @@ u8 func0408_hovercopter[] = { // Change to high label(0x54) - dprint 'C','H','A','N','G','E',' ','T','O',' ','H','I','G','H','\n',0, label(0x27) yield goto_next(0x00) @@ -1237,7 +1221,6 @@ u8 func0408_hovercopter[] = { // Change to low label(0x52) - dprint 'C','H','A','N','G','E',' ','T','O',' ','L','O','W','\n',0, if_can_see_target(/*goto*/ 0x20) move_object_to_pad(OBJ_HOVERCOPTER, PAD_ARK_0190) label(0x20) @@ -1245,7 +1228,6 @@ u8 func0408_hovercopter[] = { // Change to mid label(0x53) - dprint 'C','H','A','N','G','E',' ','T','O',' ','M','I','D','\n',0, if_can_see_target(/*goto*/ 0x20) move_object_to_pad(OBJ_HOVERCOPTER, PAD_ARK_0195) label(0x20) @@ -1278,7 +1260,6 @@ u8 func0408_hovercopter[] = { // Mid shooting label(0x48) - dprint 'S','H','O','O','T',' ','M','I','D','\n',0, try_modify_attack(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x49) goto_first(0x24) @@ -1675,7 +1656,6 @@ u8 func0409_tech_conversation[] = { if_chr_activated_object(CHR_TARGET, 0x11, /*goto*/ 0x00) if_door_state(0x11, DOORSTATE_OPEN, /*goto*/ 0x00) if_alertness(99, OPERATOR_GREATER_THAN, /*goto*/ 0x33) - dprint 'T','E','C','H',' ','1',' ','L','O','O','P','\n',0, set_chr_chrflag(CHR_TECH1, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_TECH2, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_RLSHOCK, CHRCFLAG_INVINCIBLE) @@ -1703,7 +1683,6 @@ u8 func0409_tech_conversation[] = { endloop(0x28) label(0x20) - dprint 'T','E','C','H',' ','2',' ','L','O','O','P','\n',0, chr_do_animation(ANIM_TALKING_00A0, 0, -1, CHRANIMFLAG_SLOWUPDATE, 20, CHR_SELF, 2) speak(CHR_PRESET, L_ARK_037, SFX_811D, CHANNEL_7, COLOR_06_WHITE) // "That's not how it goes." restart_timer @@ -1824,7 +1803,6 @@ u8 func0409_tech_conversation[] = { label(0x20) label(0x33) - dprint 'C','H','O','P','P','E','R',' ','C','A','N',' ','G','O','\n',0, if_stage_flag_eq(STAGEFLAG_TECHS_RUNNING, TRUE, /*goto*/ 0x00) set_stage_flag(STAGEFLAG_TECHS_RUNNING) label(0x00) @@ -1905,7 +1883,6 @@ u8 func040a_tech2[] = { label(0x00) label(0x33) - dprint 'C','H','O','P','P','E','R',' ','C','A','N',' ','G','O','\n',0, if_stage_flag_eq(STAGEFLAG_TECHS_RUNNING, TRUE, /*goto*/ 0x00) set_stage_flag(STAGEFLAG_TECHS_RUNNING) label(0x00) @@ -2140,9 +2117,7 @@ u8 func040d_cass[] = { set_chr_hiddenflag(CHR_CASS, CHRHFLAG_00100000) chr_toggle_modelpart(CHR_CASS, MODELPART_CHR_NECKLACE) chr_move_to_pad(CHR_CASS, PAD_ARK_0205, 0x00, /*goto*/ 0x00) - dprint 'M','O','V','E',' ','F','A','I','L','\n',0, label(0x00) - dprint 'M','O','V','E',' ','G','O','O','D','\n',0, #if VERSION >= VERSION_NTSC_1_0 try_face_entity(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x20) label(0x20) @@ -2466,7 +2441,6 @@ u8 func0412_outro[] = { set_ailist(CHR_P1P2, GAILIST_IDLE) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_P1P2_OPPOSITE, CHRCFLAG_HIDDEN) - dprint 'c','u','t',' ','s','c','e','n','e',' ','2',0, set_chr_chrflag(CHR_P1P2, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_CASS, CHRCFLAG_INVINCIBLE) chr_toggle_modelpart(CHR_CASS, MODELPART_CHR_NECKLACE) diff --git a/src/setups/setupazt.c b/src/setups/setupazt.c index f157fd0d6..df77e7a9a 100644 --- a/src/setups/setupazt.c +++ b/src/setups/setupazt.c @@ -1002,10 +1002,8 @@ u8 unregistered_function1[] = { restart_timer beginloop(0x67) - dprint 'T','I','M','E','\n',0, if_timer_lt(1800, /*goto*/ 0x98) label(0x31) - dprint 'S','Q','U','A','D','\n',0, if_num_chrs_in_squadron_gt(1, 0x0f, /*goto*/ 0x98) call_rng if_rand_gt(64, /*goto*/ 0x69) @@ -1057,10 +1055,8 @@ u8 func100c_spawn_dd_guards[] = { endloop(0x67) label(0x31) - dprint 'T','I','M','E','\n',0, if_timer_lt(3600, /*goto*/ 0x98) label(0x31) - dprint 'S','Q','U','A','D','\n',0, if_num_chrs_in_squadron_gt(1, 0x0e, /*goto*/ 0x98) call_rng if_rand_gt(64, /*goto*/ 0x69) @@ -1231,7 +1227,6 @@ u8 func0404_elvis[] = { restart_timer start_patrol label(0x31) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, set_target_chr(CHR_BOND) set_chrpreset(CHR_BOND) if_stage_flag_eq(STAGEFLAG_ELVIS_GAVE_PROXYMINE, TRUE, /*goto*/ 0x31) @@ -1280,7 +1275,6 @@ u8 func0404_elvis[] = { // Detected enemy label(0x0a) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, AILIST_INIT_ELVIS) set_shotlist(AILIST_INIT_ELVIS) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -1291,7 +1285,6 @@ u8 func0404_elvis[] = { try_run_to_target(/*goto*/ 0x12) beginloop(0x12) - dprint 'G','O',' ','T','O','W','A','R','D','S','\n',0, if_distance_to_target_lt(300, /*goto*/ 0x13) if_timer_gt(180, /*goto*/ 0x08) endloop(0x12) @@ -1352,7 +1345,6 @@ u8 func0418_robot[] = { goto_first(0x66) beginloop(0x04) - dprint 'P','A','R','T',' ','1','\n',0, chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) if_alertness(99, OPERATOR_GREATER_THAN, /*goto*/ 0x0d) @@ -1402,10 +1394,8 @@ u8 func0418_robot[] = { set_self_flag_bankx(CHRFLAG0_SKIPSAFETYCHECKS, BANK_0) beginloop(0x0a) - dprint 'P','A','R','T',' ','2','\n',0, if_timer_gt(180, /*goto*/ 0x08) if_distance_to_target_gt(1000, /*goto*/ 0x15) - dprint 'P','A','R','T',' ','2','\n',0, if_target_in_sight(/*goto*/ 0x13) chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) @@ -1419,7 +1409,6 @@ u8 func0418_robot[] = { label(0x13) set_target_chr(CHR_P1P2) restart_timer - dprint 'P','A','R','T',' ','3','a','\n',0, try_attack_stand(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x0e) goto_first(0x04) @@ -1452,10 +1441,8 @@ u8 func0414_spawner[] = { reloop(0x06) label(0x0a) - dprint 'H','E','A','R','S','P','A','W','N','\n',0, label(0x31) if_never_been_onscreen(/*goto*/ 0x52) - dprint 'N','E','V','E','R',' ','V','I','S','F','A','I','L','\n',0, if_can_see_target(/*goto*/ 0x0a) endloop(0x06) @@ -1463,14 +1450,11 @@ u8 func0414_spawner[] = { set_ailist(CHR_SELF, GAILIST_ALERTED) label(0x52) - dprint 'C','H','E','C','K',' ','D','U','P','E','\n',0, if_chr_death_animation_finished(CHR_CLONE, /*goto*/ 0x52) set_ailist(CHR_SELF, AILIST_SPAWNER) label(0x52) - dprint 'C','R','E','A','T','E',' ','S','P','A','W','N','\n',0, try_spawn_clone2(CHR_SELF, GAILIST_ALERTED, 0, /*goto*/ 0x31) - dprint 'C','R','E','A','T','E',' ','F','A','I','L','\n',0, set_ailist(CHR_SELF, AILIST_SPAWNER) label(0x31) @@ -1577,7 +1561,6 @@ u8 func041d_president_running[] = { set_self_chrflag(CHRCFLAG_PUSHABLE) set_alertness(100) set_shotlist(AILIST_PRESIDENT_RUNNING) - dprint 'R','E','S','T','A','R','T','\n',0, yield if_chr_dead(CHR_SELF, /*goto*/ 0x08) if_chr_death_animation_finished(CHR_SELF, /*goto*/ 0x08) @@ -1590,7 +1573,6 @@ u8 func041d_president_running[] = { restart_timer beginloop(0x9c) - dprint 'K','I','L','L','E','D','\n',0, if_timer_gt(15, /*goto*/ 0x08) endloop(0x9c) @@ -1602,7 +1584,6 @@ u8 func041d_president_running[] = { // Alive label(0x31) - dprint 'b','4',' ','s','h','i','e','l','d',' ','c','h','e','c','k','\n',0, if_just_injured(CHR_SELF, /*goto*/ 0x08) goto_next(0x9d) @@ -1613,7 +1594,6 @@ u8 func041d_president_running[] = { play_sound_from_entity(CHANNEL_6, CHR_SELF, 0x0bb8, 0x1770, 0x01) beginloop(0x9e) - dprint 'I','N','J','U','R','E','D','\n',0, if_num_times_shot_lt(1, /*goto*/ 0x08) if_timer_lt(20, /*goto*/ 0x08) label(0x08) @@ -1626,7 +1606,6 @@ u8 func041d_president_running[] = { restart_timer beginloop(0x9f) - dprint 'W','A','I','T','\n',0, // Room 0x0014 = UFO area // Yes, checking this 5 times is unnecessary if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) @@ -1634,7 +1613,6 @@ u8 func041d_president_running[] = { if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) - dprint 't','a','r','g','e','t','\n',0, if_can_see_target(/*goto*/ 0x08) goto_next(0xa0) @@ -1666,7 +1644,6 @@ u8 func041d_president_running[] = { try_run_to_target(/*goto*/ 0xa1) beginloop(0xa1) - dprint 'F','O','L','L','O','W','\n',0, if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) @@ -1695,7 +1672,6 @@ u8 func041d_president_running[] = { // Unreachable beginloop(0xa4) - dprint 'R','U','N','N','F','O','\n',0, if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) if_chr_in_room(CHR_SELF, 0x00, 0x0014, /*goto*/ 0xa5) diff --git a/src/setups/setupcave.c b/src/setups/setupcave.c index 5e9602583..c7b191dc6 100644 --- a/src/setups/setupcave.c +++ b/src/setups/setupcave.c @@ -1283,7 +1283,6 @@ u8 func0407_stewardess[] = { label(0x0f) try_jog_to_chr(CHR_SEEDIE, /*goto*/ 0x49) - dprint 'W','A','L','K','F','A','I','L','\n',0, beginloop(0x49) chr_toggle_p1p2(CHR_SELF) @@ -1293,7 +1292,6 @@ u8 func0407_stewardess[] = { set_stage_flag(STAGEFLAG_TRIGGER_MSG_NOWSYOURCHANCE) label(0x75) if_alertness(99, OPERATOR_GREATER_THAN, /*goto*/ 0x4e) - dprint 'W','A','L','K','I','N','G','\n',0, if_target_outside_my_yvisang(/*goto*/ 0x31) if_target_in_sight(/*goto*/ 0x02) label(0x31) @@ -2434,7 +2432,6 @@ u8 func040f_nsa[] = { walk_to_pad(PAD_PRESET) beginloop(0x06) - dprint 'G','O',' ','F','O','R',' ','P','A','D','\n',0, chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) if_distance_to_target_lt(250, /*goto*/ 0x64) @@ -2467,7 +2464,6 @@ u8 func040f_nsa[] = { beginloop(0x00) chr_toggle_p1p2(CHR_SELF) - dprint 'W','A','I','T',' ','F','O','R',' ','C','H','R','\n',0, set_target_chr(CHR_P1P2) if_stage_flag_eq(STAGEFLAG_SECURITY_SHUT_DOWN, TRUE, /*goto*/ 0x0b) if_can_see_target(/*goto*/ 0x31) @@ -2475,7 +2471,6 @@ u8 func040f_nsa[] = { // Seen player label(0x31) - dprint 'C','H','R','\n',0, if_chr_y(CHR_TARGET, -330, OPERATOR_LESS_THAN, /*goto*/ 0x02) goto_first(0x00) @@ -2532,7 +2527,6 @@ u8 func040f_nsa[] = { // Also unreachable label(0x31) - dprint 'R','U','N',' ','S','T','A','R','T','\n',0, restart_timer set_target_chr(CHR_BOND) try_run_to_target(/*goto*/ 0x05) @@ -2540,7 +2534,6 @@ u8 func040f_nsa[] = { beginloop(0x05) set_returnlist(CHR_SELF, GAILIST_ALERTED) set_ailist(CHR_SELF, GAILIST_ALERTED) - dprint 'G','O',' ','F','O','R',' ','C','H','R','\n',0, if_chr_stopped(/*goto*/ 0x32) if_timer_gt(30, /*goto*/ 0x32) if_chr_y(CHR_TARGET, -330, OPERATOR_LESS_THAN, /*goto*/ 0x02) @@ -3154,7 +3147,6 @@ u8 func042a_foyer_spawner[] = { set_chr_team(CHR_SELF, TEAM_04) rebuild_teams rebuild_squadrons - dprint 'O','B','J','E','C','T','I','V','E',' ','D','O','N','E','\n',0, if_never_been_onscreen(/*goto*/ 0x6a) if_can_see_target(/*goto*/ 0x04) reloop(0x00) @@ -3294,18 +3286,15 @@ u8 func0419_ba8c[] = { beginloop(0x6b) if_saw_death(0x00, /*goto*/ 0x4f) if_saw_injury(0x00, /*goto*/ 0x0f) - dprint 'D','U','R','I','N','G','T','A','L','K','\n',0, if_timer_gt(180, /*goto*/ 0x02) endloop(0x6b) label(0x02) if_self_flag_bankx_eq(CHRFLAG0_FORCESAFETYCHECKS, TRUE, BANK_0, /*goto*/ 0x33) - dprint 'N','O','T',' ','A',' ','P','A','T','R','O','L','L','E','R','\n',0, stop_chr goto_next(0x00) label(0x33) - dprint 'P','A','T',' ','R','E','T','\n',0, start_patrol label(0x00) @@ -3407,7 +3396,6 @@ u8 func0419_ba8c[] = { if_timer_lt(600, /*goto*/ 0x31) unset_self_flag_bankx(CHRFLAG0_SKIPSAFETYCHECKS, BANK_0) label(0x31) - dprint 'L','I','M','O',' ','R','E','A','D','Y',' ','T','O',' ','G','O','\n',0, goto_first(0x00) label(0x0f) @@ -3981,11 +3969,9 @@ u8 func1024_double_dy357[] = { u8 func0416_watch_flag[] = { beginloop(0x00) if_chr_has_hiddenflag(CHR_SELF, CHRHFLAG_ANTINONINTERACTABLE, /*goto*/ 0x31) - dprint 'F','L','A','G',' ','N','O','T',' ','S','E','T','\n',0, reloop(0x00) label(0x31) - dprint 'F','L','A','G',' ','S','E','T','\n',0, endloop(0x00) endlist @@ -3998,7 +3984,6 @@ u8 func101a_check_disguise_used2[] = { endloop(0x00) label(0x02) - dprint 'D','I','S','G','U','I','S','E','D',' ','U','P','\n',0, beginloop(0x04) if_chr_has_hiddenflag(CHR_P1P2, CHRHFLAG_DISGUISED, /*goto*/ 0x31) diff --git a/src/setups/setupdam.c b/src/setups/setupdam.c index e23103bff..24aa9912e 100644 --- a/src/setups/setupdam.c +++ b/src/setups/setupdam.c @@ -1583,7 +1583,6 @@ u8 func0411_labtech_alerted[] = { label(0x04) if_alertness(99, OPERATOR_GREATER_THAN, /*goto*/ 0x04) set_alertness(100) - dprint 'T','A','L','K',' ','1','\n',0, say_quip(CHR_BOND, 0x2a, 0xff, 0x02, 0xff, BANK_1, 0x00, 0x00) chr_do_animation(ANIM_SURRENDER_002E, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) @@ -2628,7 +2627,6 @@ u8 func0416_elvis_leading[] = { if_timer_gt(1200, /*goto*/ 0x08) if_enemy_distance_lt_and_los(2540, /*goto*/ 0x0b) label(0x07) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_chr_stopped(/*goto*/ 0x04) endloop(0x00) @@ -2644,11 +2642,9 @@ u8 func0416_elvis_leading[] = { beginloop(0x0c) if_enemy_distance_lt_and_los(2540, /*goto*/ 0x0b) label(0x07) - dprint 'A','T',' ','P','A','D','\n',0, endloop(0x0c) label(0x0b) - dprint 'D','E','T','E','C','T','E','D','\n',0, call_rng if_rand_lt(85, /*goto*/ 0x3b) if_rand_lt(170, /*goto*/ 0x3c) diff --git a/src/setups/setupdepo.c b/src/setups/setupdepo.c index d6f50b192..2d08e50d0 100644 --- a/src/setups/setupdepo.c +++ b/src/setups/setupdepo.c @@ -688,7 +688,6 @@ u8 func1004_laser_switch_2[] = { // Activated/deactivated label(0x08) - dprint 'S','W','I','T','C','H',' ','2',0, if_stage_flag_eq(STAGEFLAG_LASERSET2_DISABLED, TRUE, /*goto*/ 0x09) // Deactivated @@ -1056,7 +1055,6 @@ u8 func1009_spawner_during_decode[] = { goto_next(0x0d) label(0x2c) - dprint 'S','Q','U','A','D',' ','F','U','L','L',0, reloop(0x09) label(0x0b) @@ -1199,7 +1197,6 @@ u8 func100a_give_keycards[] = { disable_object(OBJ_CROSSBOW) beginloop(0x08) - dprint 'C','H','E','C','K',' ','D','E','A','D',0, if_stage_flag_eq(STAGEFLAG_CLOAK2_ONE_REMAINING, TRUE, /*goto*/ 0x2c) endloop(0x08) @@ -1211,7 +1208,6 @@ u8 func100a_give_keycards[] = { // 2A alive give_object_to_chr(OBJ_KEYCARD2, CHR_CLOAK_2A) - dprint 'G','I','V','E',' ','T','O','4',0, goto_next(0x2c) // 2A dead @@ -1220,7 +1216,6 @@ u8 func100a_give_keycards[] = { if_chr_death_animation_finished(CHR_CLOAK_2B, /*goto*/ 0x06) if_chr_knockedout(CHR_CLOAK_2B, /*goto*/ 0x06) give_object_to_chr(OBJ_KEYCARD2, CHR_CLOAK_2B) - dprint 'G','I','V','E',' ','T','O','5',0, goto_next(0x2c) // 2B dead @@ -1229,13 +1224,11 @@ u8 func100a_give_keycards[] = { if_chr_death_animation_finished(CHR_CLOAK_2C, /*goto*/ 0x06) if_chr_knockedout(CHR_CLOAK_2C, /*goto*/ 0x06) give_object_to_chr(OBJ_KEYCARD2, CHR_CLOAK_2C) - dprint 'G','I','V','E',' ','T','O','6',0, goto_next(0x2c) // 2C dead label(0x06) give_object_to_chr(OBJ_KEYCARD2, CHR_CLOAK_2D) - dprint 'G','I','V','E',' ','T','O','7',0, label(0x2c) unset_object_flag(OBJ_KEYCARD2, OBJFLAG_UNCOLLECTABLE) @@ -1434,7 +1427,6 @@ u8 func1012_check_for_end[] = { label(0x06) set_stage_flag(STAGEFLAG_EXITED_BUILDING) - dprint 'I','N',' ','T','H','E',' ','E','L','E','V','A','T','O','R','\n',0, set_invincible(CHR_BOND) yield yield @@ -1484,7 +1476,6 @@ u8 func1013_check_escape_doors[] = { label(0x06) if_object_in_good_condition(OBJ_ESCAPEDOOR2, /*goto*/ 0x06) label(0x2c) - dprint 'S','T','A','R','T',' ','A','L','A','R','M','\n',0, activate_alarm set_ailist(CHR_SELF, GAILIST_IDLE) reloop(0x04) @@ -1517,7 +1508,6 @@ u8 func100c_check_for_meeting_trigger[] = { endloop(0x00) label(0x06) - dprint 's','h','o','t',' ','1',0, set_ailist(CHR_SELF, AILIST_MEETING_CUTSCENE) endlist }; @@ -2585,11 +2575,9 @@ u8 func101d_init_mines[] = { if_savefile_flag_is_unset(GAMEFILEFLAG_G5_MINE, /*goto*/ 0x06) disable_object(OBJ_MINE1) - dprint 'E','P','R','O','M','F','L','A','G',' ','N','O','T','S','E','T',0, set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) - dprint 'E','P','R','O','M','F','L','A','G',' ','S','E','T',0, disable_object(OBJ_MINE2) set_ailist(CHR_SELF, GAILIST_IDLE) endlist diff --git a/src/setups/setupdish.c b/src/setups/setupdish.c index 69cb44831..320f76754 100644 --- a/src/setups/setupdish.c +++ b/src/setups/setupdish.c @@ -909,12 +909,10 @@ u8 func1002_devicetraining_camspy[] = { endloop(0x0c) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) set_savefile_flag(GAMEFILEFLAG_CI_CAMSPY_DONE) @@ -1040,13 +1038,11 @@ u8 func1003_devicetraining_nightvision[] = { endloop(0x0d) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_NIGHTVISION_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) set_lights_state(0x0030, LIGHTOP_1, 0xff, 0x00, 0x00) set_lights_state(0x002e, LIGHTOP_1, 0xff, 0x00, 0x00) @@ -1219,13 +1215,11 @@ u8 func1004_devicetraining_doordecoder[] = { endloop(0x0d) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_DOORDECODER_DONE) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) unset_object_flag2(0x88, OBJFLAG2_INVISIBLE) @@ -1257,7 +1251,6 @@ u8 func1005_devicetraining_xray[] = { lock_door(0x31, 0x40) lock_door(0x8a, 0x40) lock_door(0x89, 0x40) - dprint 't','r','a','i','n','i','n','g',0, enable_object(0x29) move_object_to_pad(0x29, PAD_DISH_011D) unset_object_flag(0x29, OBJFLAG_UNCOLLECTABLE) @@ -1432,13 +1425,11 @@ u8 func1005_devicetraining_xray[] = { endloop(0x0e) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_XRAY_DONE) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) label(0x84) @@ -1471,7 +1462,6 @@ u8 func1006_devicetraining_disguise[] = { lock_door(0x31, 0x40) lock_door(0x8a, 0x40) lock_door(0x89, 0x40) - dprint 't','r','a','i','n','i','n','g',0, enable_object(0x2a) move_object_to_pad(0x2a, PAD_DISH_011D) unset_object_flag(0x2a, OBJFLAG_UNCOLLECTABLE) @@ -1571,13 +1561,11 @@ u8 func1006_devicetraining_disguise[] = { endloop(0x0f) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_DISGUISE_DONE) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) label(0x84) @@ -1616,7 +1604,6 @@ u8 func1007_devicetrainign_ir[] = { lock_door(0x31, 0x40) lock_door(0x8a, 0x40) lock_door(0x89, 0x40) - dprint 't','r','a','i','n','i','n','g',0, enable_object(0x2b) move_object_to_pad(0x2b, PAD_DISH_011D) unset_object_flag(0x2b, OBJFLAG_UNCOLLECTABLE) @@ -1720,13 +1707,11 @@ u8 func1007_devicetrainign_ir[] = { endloop(0x0e) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_IR_DONE) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) label(0x84) @@ -1756,7 +1741,6 @@ u8 func1008_devicetraining_rtracker[] = { lock_door(0x31, 0x40) lock_door(0x8a, 0x40) lock_door(0x89, 0x40) - dprint 't','r','a','i','n','i','n','g',0, enable_object(0x2c) move_object_to_pad(0x2c, PAD_DISH_011D) unset_object_flag(0x2c, OBJFLAG_UNCOLLECTABLE) @@ -1847,13 +1831,11 @@ u8 func1008_devicetraining_rtracker[] = { endloop(0x0e) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_RTRACKER_DONE) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) label(0x84) @@ -1886,7 +1868,6 @@ u8 func1009_devicetraining_cloak[] = { lock_door(0x31, 0x40) lock_door(0x8a, 0x40) lock_door(0x89, 0x40) - dprint 't','r','a','i','n','i','n','g',0, restart_timer enable_object(0x2d) move_object_to_pad(0x2d, PAD_DISH_011D) @@ -1998,13 +1979,11 @@ u8 func1009_devicetraining_cloak[] = { endloop(0x0f) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_CLOAK_DONE) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) label(0x84) @@ -2151,13 +2130,11 @@ u8 func100a_devicetraining_ecmmine[] = { endloop(0x0d) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_ECMMINE_DONE) - dprint 'd','o','n','e',0, yield set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) label(0x84) @@ -2194,7 +2171,6 @@ u8 func100b_devicetraining_uplink[] = { move_object_to_pad(0x2f, PAD_DISH_0131) unset_object_flag(0x2f, OBJFLAG_UNCOLLECTABLE) unset_object_flag2(0x2f, OBJFLAG2_INVISIBLE) - dprint 't','r','a','i','n','i','n','g',0, close_door(0x31) close_door(0x8a) close_door(0x89) @@ -2359,13 +2335,11 @@ u8 func100b_devicetraining_uplink[] = { goto_first(0x82) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_UPLINK_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS) yield goto_next(0x84) @@ -2383,7 +2357,6 @@ u8 func100b_devicetraining_uplink[] = { mute_channel(CHANNEL_5) mute_channel(CHANNEL_6) mute_channel(CHANNEL_7) - dprint 'a','b','o','r','t','e','d',0, disable_object(0x2f) goto_first(0x08) @@ -2492,7 +2465,6 @@ u8 func0402_move_to_holoroom[] = { u8 func0429_grimshaw_disguise[] = { set_returnlist(CHR_SELF, AILIST_GRIMSHAW_DISGUISE) - dprint 'I','n','i','t','i','a','l','i','s','e','a',0, restart_timer beginloop(0x0f) @@ -2516,7 +2488,6 @@ u8 func0429_grimshaw_disguise[] = { endloop(0x04) label(0x2f) - dprint 'I','n','i','t','i','a','l','i','s','e','b',0, restart_timer label(0x08) if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, TRUE, BANK_1, /*goto*/ 0x06) @@ -2529,7 +2500,6 @@ u8 func0429_grimshaw_disguise[] = { endloop(0x09) label(0x06) - dprint 'I','n','i','t','i','a','l','i','s','e','c',0, do_preset_animation(PRESETANIM_TALK3) play_cistaff_quip(CIQUIP_GREETING, CHANNEL_6) restart_timer @@ -2540,7 +2510,6 @@ u8 func0429_grimshaw_disguise[] = { endloop(0x57) label(0x06) - dprint 'I','n','i','t','i','a','l','i','s','e','d',0, restart_timer beginloop(0x58) @@ -2598,18 +2567,15 @@ u8 func0429_grimshaw_disguise[] = { u8 func100c_cloak_detection[] = { beginloop(0x04) deactivate_alarm - dprint 'I','N','I','T','Y',0, if_stage_flag_eq(STAGEFLAG_TRIGGER_CLOAK, TRUE, /*goto*/ 0x8f) reloop(0x04) beginloop(0x8f) - dprint 'L','O','O','P','Y',0, if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x5d) if_chr_distance_to_pad_lt(CHR_BOND, 200, PAD_DISH_027B, /*goto*/ 0x06) endloop(0x8f) beginloop(0x5d) - dprint 'W','A','I','T','Y',0, if_stage_flag_eq(STAGEFLAG_TRIGGER_CLOAK, FALSE, /*goto*/ 0x30) endloop(0x5d) @@ -2627,7 +2593,6 @@ u8 func100c_cloak_detection[] = { endloop(0x04) label(0x06) - dprint 'G','O','T','T','H','R','U',0, if_chr_has_hiddenflag(CHR_BOND, CHRHFLAG_CLOAKED, /*goto*/ 0x30) activate_alarm yield @@ -2671,7 +2636,6 @@ u8 func100c_cloak_detection[] = { beginloop(0x5c) yield - dprint 'W','A','I','T','F','I','N',0, if_timer_gt(60, /*goto*/ 0x2f) endloop(0x5c) @@ -2692,7 +2656,6 @@ u8 func042a_carrington_cloak[] = { endloop(0x8f) label(0x06) - dprint 'I','n','i','t','i','a','l','i','s','e','a',0, beginloop(0x04) if_target_in_sight(/*goto*/ 0x2f) @@ -2708,7 +2671,6 @@ u8 func042a_carrington_cloak[] = { label(0x2f) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) close_door(0x40) - dprint 'I','n','i','t','i','a','l','i','s','e','b',0, restart_timer label(0x08) if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, TRUE, BANK_1, /*goto*/ 0x06) @@ -2720,7 +2682,6 @@ u8 func042a_carrington_cloak[] = { endloop(0x09) label(0x06) - dprint 'I','n','i','t','i','a','l','i','s','e','c',0, restart_timer chr_do_animation(ANIM_WALK_BACKWARDS, -1, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) restart_timer @@ -2938,7 +2899,6 @@ u8 func042b_init_carrington[] = { #if VERSION >= VERSION_NTSC_1_0 set_savefile_flag(GAMEFILEFLAG_CI_TOUR_DONE) #endif - dprint 'E','E','P','R','O','M',' ','S','E','T',0, beginloop(0x08) chr_move_to_pad(CHR_SELF, PAD_CARRINGTON_OFFICE, 0x01, /*goto*/ 0x2f) @@ -2948,7 +2908,6 @@ u8 func042b_init_carrington[] = { set_ailist(CHR_SELF, 0x041e) label(0x06) - dprint 'E','E','P','R','O','M',' ','N','O','T','S','E','T',0, if_savefile_flag_is_unset(GAMEFILEFLAG_CI_TOUR_DONE, /*goto*/ 0x8f) goto_first(0x08) @@ -2984,7 +2943,6 @@ u8 func042c_carrington_tour[] = { try_face_entity(ATTACKFLAG_AIMATPAD, 0x0054, /*goto*/ 0x04) beginloop(0x04) - dprint 'F','A','C','E',' ','P','A','D',0, if_timer_gt(1200, /*goto*/ 0x2f) if_can_see_target(/*goto*/ 0x2f) if_chr_idle(/*goto*/ 0x06) @@ -3631,7 +3589,6 @@ u8 func101c_holo1_main[] = { unset_object_flag2(0x4e, OBJFLAG2_IMMUNETOANTI) unset_object_flag2(0x4f, OBJFLAG2_IMMUNETOANTI) disable_chr(0x04) - dprint 't','r','a','i','n','i','n','g',0, label(0x91) if_object_flag2(0x4c, OBJFLAG2_IMMUNETOANTI, /*goto*/ 0x2f) goto_next(0x06) @@ -3675,13 +3632,11 @@ u8 func101c_holo1_main[] = { goto_first(0x91) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_HOLO1_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) yield goto_next(0x84) @@ -3699,7 +3654,6 @@ u8 func101c_holo1_main[] = { mute_channel(CHANNEL_6) mute_channel(CHANNEL_7) enable_chr(0x04) - dprint 'a','b','o','r','t','e','d',0, disable_object(0x48) disable_object(0x49) disable_object(0x4a) @@ -3907,23 +3861,19 @@ u8 func0430_holo1_check_done[] = { goto_next(0x06) label(0x2f) - dprint 'D','O','H','1',0, if_object_flag2(0x4d, OBJFLAG2_00040000, /*goto*/ 0x2f) goto_next(0x06) label(0x2f) - dprint 'D','O','H','2',0, if_object_flag2(0x4e, OBJFLAG2_00040000, /*goto*/ 0x2f) goto_next(0x06) label(0x2f) - dprint 'D','O','H','3',0, if_object_flag2(0x4f, OBJFLAG2_00040000, /*goto*/ 0x2f) goto_next(0x06) // All flags are set label(0x2f) - dprint 'D','O','H','4',0, remove_hudmsgs show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_106) // "Holoprogram 1 has been completed successfully." restart_timer @@ -3993,7 +3943,6 @@ u8 func1022_holo2_main[] = { enable_object(0x56) enable_object(0x57) disable_chr(0x04) - dprint 't','r','a','i','n','i','n','g',0, label(0x2f) label(0x91) remove_hudmsgs @@ -4017,13 +3966,11 @@ u8 func1022_holo2_main[] = { goto_first(0x91) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) goto_next(0x90) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_HOLO2_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) yield goto_next(0x84) @@ -4040,7 +3987,6 @@ u8 func1022_holo2_main[] = { mute_channel(CHANNEL_6) mute_channel(CHANNEL_7) enable_chr(0x04) - dprint 'a','b','o','r','t','e','d',0, disable_object(0x54) disable_object(0x55) disable_object(0x56) @@ -4300,7 +4246,6 @@ u8 func1027_holo3_main[] = { close_door(0x70) close_door(0x71) close_door(0x72) - dprint 't','r','a','i','n','i','n','g',0, label(0x2f) label(0x91) remove_hudmsgs @@ -4325,13 +4270,11 @@ u8 func1027_holo3_main[] = { goto_first(0x91) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_HOLO3_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) yield goto_next(0x84) @@ -4348,7 +4291,6 @@ u8 func1027_holo3_main[] = { mute_channel(CHANNEL_6) mute_channel(CHANNEL_7) enable_chr(0x04) - dprint 'a','b','o','r','t','e','d',0, disable_object(0x58) disable_object(0x59) disable_object(0x5a) @@ -4528,7 +4470,6 @@ u8 func1028_holo4_main[] = { disable_chr(0x04) try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, PAD_DISH_0274, AILIST_HOLO4_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x08) label(0x08) - dprint 't','r','a','i','n','i','n','g',0, label(0x91) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) remove_hudmsgs @@ -4567,13 +4508,11 @@ u8 func1028_holo4_main[] = { goto_first(0x91) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_HOLO4_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) yield goto_next(0x84) @@ -4592,7 +4531,6 @@ u8 func1028_holo4_main[] = { remove_chr(0x0d) remove_chr(0x0e) remove_chr(0x0f) - dprint 'a','b','o','r','t','e','d',0, enable_object(0x45) label(0x06) remove_hudmsgs @@ -4772,7 +4710,6 @@ u8 func1029_holo5_main[] = { try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, PAD_DISH_0126, AILIST_HOLO5_INIT_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x06) label(0x06) yield - dprint 't','r','a','i','n','i','n','g',0, label(0x91) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) remove_hudmsgs @@ -4812,13 +4749,11 @@ u8 func1029_holo5_main[] = { goto_first(0x82) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_HOLO5_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) yield goto_next(0x84) @@ -4838,7 +4773,6 @@ u8 func1029_holo5_main[] = { remove_chr(0x10) remove_chr(0x11) remove_chr(0x12) - dprint 'a','b','o','r','t','e','d',0, enable_object(0x45) remove_hudmsgs @@ -4865,7 +4799,6 @@ u8 func0406_holo5_init_guard1[] = { u8 func0407_holo5_guard1[] = { set_self_flag_bankx(CHRFLAG0_CANLOSEGUN, BANK_0) - dprint 'C','R','E','A','T','E','D',' ','4',0, set_shotlist(AILIST_HOLO5_GUARD1) set_chr_maxdamage(CHR_SELF, 300) add_health_or_armor(300) @@ -4954,7 +4887,6 @@ u8 func0408_holo5_init_guard2[] = { }; u8 func0409_holo5_guard2[] = { - dprint 'C','R','E','A','T','E','D',' ','5',0, set_shotlist(AILIST_HOLO5_GUARD2) label(0x04) yield @@ -4966,7 +4898,6 @@ u8 func0409_holo5_guard2[] = { start_patrol label(0x08) yield - dprint 'O','n',' ','P','a','t','r','o','l',0, if_chr_death_animation_finished(CHR_SELF, /*goto*/ 0x2f) if_chr_dead(CHR_SELF, /*goto*/ 0x2f) if_chr_knockedout(CHR_SELF, /*goto*/ 0x2f) @@ -5014,7 +4945,6 @@ u8 func040a_holo5_init_guard3[] = { }; u8 func040b_holo5_guard3[] = { - dprint 'C','R','E','A','T','E','D',' ','6',0, set_shotlist(AILIST_HOLO_GUARD_ARMED_UNALERT) restart_timer @@ -5061,10 +4991,8 @@ u8 func1034_holo5_part1[] = { if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) #if VERSION >= VERSION_NTSC_1_0 if_chr_has_flag_bankx(0x10, CHRFLAG0_00008000, BANK_0, /*goto*/ 0x2f) - dprint 'C','H','R',' ','4','F','D',0, #else if_chr_alertness_lt(100, 0x10, /*goto*/ 0x06) - dprint 'C','H','R',' ','4','F','D',0, goto_next(0x2f) #endif label(0x06) @@ -5083,7 +5011,6 @@ u8 func1034_holo5_part1[] = { goto_first(0x04) label(0x2f) - dprint 'C','H','R',' ','5','F','D',0, yield yield yield @@ -5096,7 +5023,6 @@ u8 func1034_holo5_part1[] = { goto_first(0x04) label(0x2f) - dprint 'C','H','R',' ','6','F','D',0, restart_timer if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) @@ -5162,7 +5088,6 @@ u8 func102e_holo6_main[] = { endloop(0x5c) label(0x5d) - dprint 't','r','a','i','n','i','n','g',0, label(0x2f) label(0x91) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) @@ -5188,13 +5113,11 @@ u8 func102e_holo6_main[] = { goto_first(0x91) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_HOLO6_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) yield goto_next(0x84) @@ -5215,7 +5138,6 @@ u8 func102e_holo6_main[] = { remove_chr(0x14) remove_chr(0x15) remove_chr(0x16) - dprint 'a','b','o','r','t','e','d',0, enable_object(0x45) label(0x06) remove_hudmsgs @@ -5460,7 +5382,6 @@ u8 func102f_holo1_part1[] = { yield yield yield - dprint 'N','O',' ','D','E','A','D',0, if_stage_flag_eq(STAGEFLAG_HOLO_ABORTING, TRUE, /*goto*/ 0x0d) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) if_chr_dead(0x13, /*goto*/ 0x2f) @@ -5473,7 +5394,6 @@ u8 func102f_holo1_part1[] = { yield yield yield - dprint 'C','H','R',' ','7','F','D',0, if_stage_flag_eq(STAGEFLAG_HOLO_ABORTING, TRUE, /*goto*/ 0x0d) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) if_chr_dead(0x14, /*goto*/ 0x2f) @@ -5486,7 +5406,6 @@ u8 func102f_holo1_part1[] = { yield yield yield - dprint 'C','H','R',' ','8','F','D',0, if_stage_flag_eq(STAGEFLAG_HOLO_ABORTING, TRUE, /*goto*/ 0x0d) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) if_chr_dead(0x15, /*goto*/ 0x2f) @@ -5499,7 +5418,6 @@ u8 func102f_holo1_part1[] = { yield yield yield - dprint 'C','H','R',' ','9','F','D',0, if_stage_flag_eq(STAGEFLAG_HOLO_ABORTING, TRUE, /*goto*/ 0x0d) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) if_chr_dead(0x16, /*goto*/ 0x2f) @@ -5508,7 +5426,6 @@ u8 func102f_holo1_part1[] = { goto_first(0x04) label(0x2f) - dprint 'C','H','R',' ','1','0','F','D',0, if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) remove_hudmsgs @@ -5577,7 +5494,6 @@ u8 func1030_holo7_main[] = { endloop(0x5d) label(0x5e) - dprint 't','r','a','i','n','i','n','g',0, label(0x2f) label(0x91) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) @@ -5587,7 +5503,6 @@ u8 func1030_holo7_main[] = { restart_timer beginloop(0x82) - dprint 't','r','a','n',' ','l','o','o','p',0, if_stage_flag_eq(STAGEFLAG_HOLO_ABORTING, TRUE, /*goto*/ 0x90) if_stage_flag_eq(STAGEFLAG_TRIGGER_HOLO_FAILURE, TRUE, /*goto*/ 0x85) if_stage_flag_eq(STAGEFLAG_TRIGGER_HOLO_SUCCESS, TRUE, /*goto*/ 0x83) @@ -5605,13 +5520,11 @@ u8 func1030_holo7_main[] = { goto_first(0x91) label(0x85) - dprint 'f','a','i','l',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) goto_next(0x84) label(0x83) set_savefile_flag(GAMEFILEFLAG_CI_HOLO7_DONE) - dprint 'd','o','n','e',0, set_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) yield goto_next(0x84) @@ -5633,7 +5546,6 @@ u8 func1030_holo7_main[] = { remove_chr(0x1b) remove_chr(0x17) remove_chr(0x18) - dprint 'a','b','o','r','t','e','d',0, enable_object(0x45) remove_hudmsgs @@ -6066,7 +5978,6 @@ u8 func1042_check_jo_in_training_room[] = { beginloop(0x04) // Wait until player in training #if VERSION >= VERSION_NTSC_1_0 - dprint 'C','H','K','1',0, #endif if_stage_flag_eq(STAGEFLAG_TRIGGER_UPLINK, TRUE, /*goto*/ 0x2f) if_stage_flag_eq(STAGEFLAG_TRIGGER_ECMMINE, TRUE, /*goto*/ 0x2f) @@ -6105,7 +6016,6 @@ u8 func1042_check_jo_in_training_room[] = { set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE) label(0x06) #if VERSION >= VERSION_NTSC_1_0 - dprint 'C','H','K','2',0, #endif yield yield @@ -6114,7 +6024,6 @@ u8 func1042_check_jo_in_training_room[] = { label(0x57) #if VERSION >= VERSION_NTSC_1_0 - dprint 'C','H','K','3',0, #endif yield if_stage_flag_eq(STAGEFLAG_CONSIDER_WARP, TRUE, /*goto*/ 0x2f) @@ -6123,7 +6032,6 @@ u8 func1042_check_jo_in_training_room[] = { label(0x2f) label(0x59) #if VERSION >= VERSION_NTSC_1_0 - dprint 'C','H','K','4',0, #endif yield if_stage_flag_eq(STAGEFLAG_CONSIDER_WARP, FALSE, /*goto*/ 0x2f) @@ -6131,7 +6039,6 @@ u8 func1042_check_jo_in_training_room[] = { label(0x2f) #if VERSION >= VERSION_NTSC_1_0 - dprint 'C','H','K','5',0, #endif yield yield @@ -6150,7 +6057,6 @@ u8 func1042_check_jo_in_training_room[] = { restart_timer label(0x5c) #if VERSION >= VERSION_NTSC_1_0 - dprint 'C','H','K','6',0, #endif yield if_timer_gt(60, /*goto*/ 0x2f) diff --git a/src/setups/setupear.c b/src/setups/setupear.c index 2473c6796..68301f711 100644 --- a/src/setups/setupear.c +++ b/src/setups/setupear.c @@ -939,12 +939,10 @@ u8 func0404_scientist[] = { goto_next(0x06) label(0x2f) - dprint 'N','I','S','D','E','A','D','\n',0, set_shotlist(GAILIST_IDLE) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) - dprint 'N','I','S','2','\n',0, if_just_injured(CHR_SELF, /*goto*/ 0x2f) goto_next(0x06) @@ -1043,7 +1041,6 @@ u8 func0404_scientist[] = { goto_first(0x09) label(0x06) - dprint 'T','A','L','K',' ','1','\n',0, say_quip(CHR_TARGET, 0x0a, 0xff, 0x00, 0xff, 0x81, 0x03, 0x08) restart_timer stop_chr @@ -1055,7 +1052,6 @@ u8 func0404_scientist[] = { endloop(0x56) label(0x06) - dprint 'T','A','L','K',' ','1','\n',0, say_quip(CHR_TARGET, 0x0b, 0xff, 0x00, 0xff, 0x81, 0x04, 0x09) restart_timer @@ -1173,19 +1169,16 @@ u8 func0407_init_nasty_scientist[] = { u8 func0406_nasty_scientist[] = { set_shotlist(AILIST_NASTY_SCIENTIST) - dprint 'N','A','S','T','Y','1','\n',0, if_chr_dead(CHR_SELF, /*goto*/ 0x2f) if_chr_death_animation_finished(CHR_SELF, /*goto*/ 0x2f) if_chr_knockedout(CHR_SELF, /*goto*/ 0x2f) goto_next(0x06) label(0x2f) - dprint 'N','A','S','T','Y',' ','D','E','A','D','\n',0, set_shotlist(GAILIST_IDLE) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) - dprint 'N','A','S','T','Y','2','\n',0, if_just_injured(CHR_SELF, /*goto*/ 0x2f) if_num_times_shot_lt(1, /*goto*/ 0x06) label(0x2f) @@ -1235,7 +1228,6 @@ u8 func0406_nasty_scientist[] = { endloop(0x56) label(0x06) - dprint 'T','A','L','K',' ','1','\n',0, say_quip(CHR_TARGET, 0x0b, 0xff, 0x00, 0xff, 0x81, 0x04, 0x09) restart_timer @@ -2077,7 +2069,6 @@ u8 func100b_check_uplink_pc_destroyed[] = { }; u8 func0411_yellowbot[] = { - dprint 'h','o','v','\n',0, label(0x03) begin_hovercar_path(0x05) set_vehicle_speed(512, 120) @@ -2101,11 +2092,9 @@ u8 func0411_yellowbot[] = { }; u8 func0412_purplebot_programs[] = { - dprint 'h','o','v','\n',0, if_difficulty_gt(DIFF_A, /*goto*/ 0x04) // Agent - dprint 'm','o','v','\n',0, move_object_to_pad(OBJ_PURPLEBOT, PAD_EAR_00BE) goto_next(0x14) @@ -2375,7 +2364,6 @@ u8 func0417_outro[] = { set_ailist(CHR_DRCAROLL, GAILIST_IDLE) set_ailist(CHR_K7_GUARD, GAILIST_IDLE) restart_timer - dprint 's','h','o','t',' ','1',0, camera_movement(ANIM_CUT_EAR_OUTRO_CAM_01) chr_do_animation(ANIM_CUT_EAR_OUTRO_JO_01, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) set_cutscene_weapon(CHR_P1P2, -1, -1) @@ -2394,21 +2382,18 @@ u8 func0417_outro[] = { wait_for_camera(0x08) - dprint 's','h','o','t',' ','2',0, if_controller_button_pressed(/*goto*/ 0x06) camera_movement(ANIM_CUT_EAR_OUTRO_CAM_02) chr_do_animation(ANIM_CUT_EAR_OUTRO_JO_02, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) wait_for_camera(0x09) - dprint 's','h','o','t',' ','3',0, if_controller_button_pressed(/*goto*/ 0x06) camera_movement(ANIM_CUT_EAR_OUTRO_CAM_03) chr_do_animation(ANIM_CUT_EAR_OUTRO_JO_03, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) wait_for_camera(0x0a) - dprint 's','h','o','t',' ','4',0, if_controller_button_pressed(/*goto*/ 0x06) camera_movement(ANIM_CUT_EAR_OUTRO_CAM_04) chr_do_animation(ANIM_CUT_EAR_OUTRO_JO_04, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) @@ -2434,7 +2419,6 @@ u8 func0417_outro[] = { label(0x2f) label(0x06) - dprint 's','h','o','t',' ','5',0, if_controller_button_pressed(/*goto*/ 0x06) unset_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_UNPLAYABLE) @@ -2445,7 +2429,6 @@ u8 func0417_outro[] = { wait_for_camera(0x0c) - dprint 's','h','o','t',' ','6',0, if_controller_button_pressed(/*goto*/ 0x06) camera_movement(ANIM_CUT_EAR_OUTRO_CAM_06) chr_do_animation(ANIM_CUT_EAR_OUTRO_JO_06, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) @@ -2453,7 +2436,6 @@ u8 func0417_outro[] = { wait_for_camera(0x0d) - dprint 's','h','o','t',' ','7',0, if_controller_button_pressed(/*goto*/ 0x06) camera_movement(ANIM_CUT_EAR_OUTRO_CAM_07) chr_do_animation(ANIM_CUT_EAR_OUTRO_JO_07, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) @@ -2461,7 +2443,6 @@ u8 func0417_outro[] = { wait_for_camera(0x0e) - dprint 's','h','o','t',' ','8',0, camera_movement(ANIM_CUT_EAR_OUTRO_CAM_08) chr_do_animation(ANIM_CUT_EAR_OUTRO_JO_08, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) chr_do_animation(ANIM_CUT_EAR_OUTRO_DRC_04, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) @@ -2632,7 +2613,6 @@ u8 func100f_check_for_end_level[] = { label(0x06) set_stage_flag(STAGEFLAG_DRCAROLL_LOCATED) - dprint 's','h','o','t',' ','6',0, yield #if VERSION < VERSION_NTSC_1_0 yield diff --git a/src/setups/setupeld.c b/src/setups/setupeld.c index 3635b3c28..d9d94a8fd 100644 --- a/src/setups/setupeld.c +++ b/src/setups/setupeld.c @@ -1261,7 +1261,6 @@ u8 func0408_outro[] = { #define outro_wait_until1(time, msg, loopid) \ beginloop(loopid) \ - dprint msg, '\n', 0, \ if_controller_button_pressed(/*goto*/ 0x56) \ if_timer_gt(time, /*goto*/ 0x06) \ endloop(loopid) \ @@ -1269,7 +1268,6 @@ u8 func0408_outro[] = { #define outro_wait_until2(time, msg1, msg2, loopid) \ beginloop(loopid) \ - dprint msg1, msg2, '\n', 0, \ if_controller_button_pressed(/*goto*/ 0x56) \ if_timer_gt(time, /*goto*/ 0x06) \ endloop(loopid) \ @@ -1317,7 +1315,6 @@ u8 func0408_outro[] = { // @bug: No check for button presses for about 8 seconds while Carrington is // saying the above line. beginloop(0xaf) - dprint '1','4','\n',0, if_timer_gt(738, /*goto*/ 0x06) endloop(0xaf) @@ -1382,7 +1379,6 @@ u8 func0408_outro[] = { label(0x56) label(0x06) - dprint '3','2','\n',0, mute_channel(CHANNEL_7) mute_channel(CHANNEL_6) mute_channel(CHANNEL_5) @@ -1553,7 +1549,6 @@ u8 func0402_taker[] = { beginloop(0x04) chr_toggle_p1p2(CHR_SELF) - dprint 'A','I','M','I','N','G',' ','A','T',' ','M','E','\n',0, if_chr_distance_to_pad_lt(CHR_P1P2, 200, PAD_ELD_0236, /*goto*/ 0x06) label(0x2d) if_self_flag_bankx_eq(CHRFLAG0_CAN_FLEESURRENDER, TRUE, BANK_0, /*goto*/ 0x06) @@ -1678,7 +1673,6 @@ u8 func0403_negotiator[] = { run_to_pad(PAD_ELD_004F) beginloop(0x08) - dprint 'R','U','N',' ','T','O',' ','P','A','D','\n',0, if_chr_stopped(/*goto*/ 0x06) endloop(0x08) @@ -1800,7 +1794,6 @@ u8 func0404_sniper[] = { beginloop(0x04) chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) - dprint 'S','T','A','R','T','\n',0, if_target_in_sight(/*goto*/ 0x58) // Choose a direction to face @@ -1826,7 +1819,6 @@ u8 func0404_sniper[] = { // Not actually running to a pad. Just waiting 2 seconds for the change // in direction, or until detected player. label(0x06) - dprint 'R','U','N',' ','T','O',' ','P','A','D','\n',0, restart_timer beginloop(0x0a) @@ -1835,7 +1827,6 @@ u8 func0404_sniper[] = { if_target_in_sight(/*goto*/ 0x58) if_saw_death(0x00, /*goto*/ 0x58) if_saw_injury(0x00, /*goto*/ 0x58) - dprint 'F','A','C','E','\n',0, if_timer_gt(120, /*goto*/ 0x06) endloop(0x0a) @@ -1870,7 +1861,6 @@ u8 func0404_sniper[] = { if_target_in_sight(/*goto*/ 0x58) if_saw_death(0x00, /*goto*/ 0x58) if_saw_injury(0x00, /*goto*/ 0x58) - dprint 'R','U','N','\n',0, call_rng if_rand_gt(3, /*goto*/ 0x2d) if_timer_gt(600, /*goto*/ 0x06) @@ -1909,7 +1899,6 @@ u8 func0404_sniper[] = { endloop(0x04) label(0x64) - dprint 'S','N','I','P','E',' ','D','I','E','\n',0, set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; diff --git a/src/setups/setupimp.c b/src/setups/setupimp.c index 1f9ad1c03..b20f27e9d 100644 --- a/src/setups/setupimp.c +++ b/src/setups/setupimp.c @@ -703,7 +703,6 @@ u8 func0413_defend_pad[] = { jog_to_pad(PAD_PRESET) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x0a) if_chr_distance_to_pad_lt(CHR_SELF, 200, PAD_PRESET, /*goto*/ 0x08) endloop(0x04) @@ -713,7 +712,6 @@ u8 func0413_defend_pad[] = { stop_chr beginloop(0x0b) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x0a) if_chr_distance_to_pad_gt(CHR_SELF, 300, PAD_PRESET, /*goto*/ 0x08) endloop(0x0b) @@ -723,7 +721,6 @@ u8 func0413_defend_pad[] = { // Detected enemy label(0x0a) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_shotlist(AILIST_DEFEND_PAD) set_returnlist(CHR_SELF, AILIST_DEFEND_PAD) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -1618,7 +1615,6 @@ u8 func0414_firingrange_hostage[] = { jog_to_pad(PAD_PRESET) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x0a) goto_next(0x12) endloop(0x04) @@ -1627,7 +1623,6 @@ u8 func0414_firingrange_hostage[] = { stop_chr beginloop(0x0b) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x0a) goto_next(0x12) endloop(0x0b) @@ -1636,7 +1631,6 @@ u8 func0414_firingrange_hostage[] = { goto_first(0x03) label(0x0a) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, AILIST_FIRINGRANGE_HOSTAGE) set_shotlist(AILIST_FIRINGRANGE_HOSTAGE) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -3007,7 +3001,6 @@ u8 func1015_firingrange_pc[] = { reloop(0x04) \ \ label(0x2e) \ - dprint 'O','B','J','E','C','T','I','V','E',' ','D','O','N','E','\n',0, \ if_never_been_onscreen(/*goto*/ 0x4f) \ if_can_see_target(/*goto*/ 0x0a) \ reloop(0x04) \ @@ -3149,7 +3142,6 @@ u8 func0410_spawner6[] = { reloop(0x04) label(0x2e) - dprint 'O','B','J','E','C','T','I','V','E',' ','D','O','N','E','\n',0, if_never_been_onscreen(/*goto*/ 0x4f) if_can_see_target(/*goto*/ 0x0a) reloop(0x04) @@ -3305,7 +3297,6 @@ u8 func1022_skedar_shuttle[] = { restart_timer beginloop(0x0b) - dprint 'O','B','J','\n',0, if_timer_gt(60, /*goto*/ 0x2e) endloop(0x0b) @@ -3314,12 +3305,10 @@ u8 func1022_skedar_shuttle[] = { play_sound_from_object(CHANNEL_4, OBJ_SKEDAR_SHUTTLE, 1, 1800, 3000) beginloop(0x0d) - dprint 'O','B','J','\n',0, if_timer_gt(200, /*goto*/ 0x08) endloop(0x0d) label(0x08) - dprint 'O','B','J','E','C','T','I','V','E',' ','D','O','N','E','\n',0, set_stage_flag(STAGEFLAG_BOMB_AIRBORNE) restart_timer diff --git a/src/setups/setuplee.c b/src/setups/setuplee.c index 3e0f19dc1..349490dd5 100644 --- a/src/setups/setuplee.c +++ b/src/setups/setuplee.c @@ -944,7 +944,6 @@ u8 func0409_elvis_follow[] = { #if VERSION >= VERSION_NTSC_1_0 restart_timer say_quip(CHR_BOND, 0x29, 0xff, 0x03, 0xff, BANK_1, 0x00, 0x00) - dprint 'I','N','J','U','R','E','D','\n',0, beginloop(LABEL_C1) if_timer_gt(180, /*goto*/ 0x06) @@ -953,7 +952,6 @@ u8 func0409_elvis_follow[] = { // Healthy label(0x06) - dprint 'I','N','J','U','R','E','D','F','I','N','\n',0, #else say_quip(CHR_BOND, 0x29, 0xff, 0x03, 0xff, BANK_1, 0x00, 0x00) @@ -985,7 +983,6 @@ u8 func0409_elvis_follow[] = { if_stage_flag_eq(STAGEFLAG_SAID_GO_ON_AHEAD, TRUE, /*goto*/ 0x2c) if_chr_in_room(CHR_ELVIS, 0x00, 0x006c, /*goto*/ LABEL_C4) label(0x2c) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) set_target_chr(CHR_PRESET) if_distance_to_target_lt(200, /*goto*/ 0x06) @@ -1007,7 +1004,6 @@ u8 func0409_elvis_follow[] = { if_stage_flag_eq(STAGEFLAG_SAID_GO_ON_AHEAD, TRUE, /*goto*/ 0x2c) if_chr_in_room(CHR_ELVIS, 0x00, 0x006c, /*goto*/ LABEL_C4) label(0x2c) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) set_target_chr(CHR_PRESET) if_distance_to_target_gt(300, /*goto*/ 0x06) @@ -1027,7 +1023,6 @@ u8 func0409_elvis_follow[] = { goto_first(0x03) label(0x06) - dprint 'D','E','T','E','C','T','E','D','\n',0, call_rng if_rand_lt(85, /*goto*/ LABEL_65) if_rand_lt(170, /*goto*/ LABEL_66) @@ -1120,7 +1115,6 @@ u8 func041c_elvis_outside_prebridgelift[] = { endloop(0x0c) label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_shotlist(AILIST_ELVIS_OUTSIDE_PREBRIDGELIFT) set_returnlist(CHR_SELF, AILIST_ELVIS_OUTSIDE_PREBRIDGELIFT) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -1235,7 +1229,6 @@ u8 func041b_elvis_at_bridge[] = { endloop(0x0c) label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_shotlist(AILIST_ELVIS_AT_BRIDGE) set_returnlist(CHR_SELF, AILIST_ELVIS_AT_BRIDGE) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -1412,7 +1405,6 @@ u8 func1008_hangar_lifts[] = { // Activate Jo's lift so it starts going to bottom label(0x2c) - dprint 'U','N','\n',0, unset_object_flag(OBJ_HANGARLIFT_JO, OBJFLAG_DEACTIVATED) yield yield @@ -1428,7 +1420,6 @@ u8 func1008_hangar_lifts[] = { // Wait until lift stopped at bottom beginloop(LABEL_65) - dprint 'D','A','\n',0, if_lift_stationary(OBJ_HANGARLIFT_JO, /*goto*/ LABEL_66) endloop(LABEL_65) @@ -1443,7 +1434,6 @@ u8 func1008_hangar_lifts[] = { set_object_flag(OBJ_HANGARLIFT_JO, OBJFLAG_DEACTIVATED) beginloop(LABEL_67) - dprint 'T','R','\n',0, chr_toggle_p1p2(CHR_SELF) if_chr_death_animation_finished(CHR_BOND, /*goto*/ 0x2c) if_chr_in_room(CHR_BOND, 0x00, 0x0018, /*goto*/ 0x2c) @@ -1453,7 +1443,6 @@ u8 func1008_hangar_lifts[] = { // Door closing automatically - reopen it label(0x2d) - dprint 'P','E','\n',0, goto_first(LABEL_66) // Jo has entered the lift, or Jo dead in co-op @@ -1473,7 +1462,6 @@ u8 func1008_hangar_lifts[] = { // Wait until Y coordinate >= 400 beginloop(0x09) - dprint 'P','U','\n',0, chr_toggle_p1p2(CHR_SELF) if_chr_death_animation_finished(CHR_P1P2, /*goto*/ 0x2c) if_chr_y(CHR_P1P2, 400, OPERATOR_LESS_THAN, /*goto*/ 0x2c) @@ -1698,7 +1686,6 @@ u8 func0408_knifeable_skedar[] = { chr_toggle_p1p2(CHR_SELF) set_target_chr(CHR_P1P2) if_just_injured(CHR_SELF, /*goto*/ 0x0c) - dprint 'W','A','I','T','I','N','G',' ','T','W','O','\n',0, if_chr_stopped(/*goto*/ 0x0d) label(0x06) if_target_in_sight(/*goto*/ 0x0c) @@ -1914,7 +1901,6 @@ u8 func0419_hangar_maian[] = { go_to_target_pad(GOPOSFLAG_RUN) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_chr_distance_to_pad_lt(CHR_SELF, 200, PAD_PRESET, /*goto*/ 0x06) if_timer_gt(60, /*goto*/ 0x2c) @@ -1929,7 +1915,6 @@ u8 func0419_hangar_maian[] = { // Wait at pad for enemy beginloop(0x09) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_chr_distance_to_pad_gt(CHR_SELF, 300, PAD_PRESET, /*goto*/ 0x06) endloop(0x09) @@ -1939,7 +1924,6 @@ u8 func0419_hangar_maian[] = { // Enemy detected label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, AILIST_HANGAR_MAIAN) set_shotlist(AILIST_HANGAR_MAIAN) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -2486,7 +2470,6 @@ u8 func041a_bridgeclone[] = { // Close to target - face them label(0x2e) restart_timer - dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0, if_target_in_fov_left(10, /*goto*/ 0x06) if_target_out_of_fov_left(246, /*goto*/ 0x06) stop_chr @@ -3240,7 +3223,6 @@ u8 func0421_bridge_skedar[] = { label(LABEL_60) try_attack_amount(40, 60) - dprint 'F','I','R','E',' ','F','U','L','L','\n',0, label(0x06) goto_first(LABEL_CB) @@ -3579,7 +3561,6 @@ u8 func101c_lift_door_sounds[] = { endloop(LABEL_C2) label(0x2c) - dprint 'S','O','U','N','D','\n',0, play_sound(SFX_81A6, -1) restart_timer diff --git a/src/setups/setuplip.c b/src/setups/setuplip.c index ce1143b0c..ff4cccb91 100644 --- a/src/setups/setuplip.c +++ b/src/setups/setuplip.c @@ -1097,7 +1097,6 @@ u8 func1007_check_disguise_collected[] = { endloop(0x04) label(0x06) - dprint 'D','I','S','G','U','I','S','E','D',' ','U','P','\n',0, beginloop(0x08) if_chr_has_hiddenflag(CHR_P1P2, CHRHFLAG_DISGUISED, /*goto*/ LABEL_2D) @@ -1590,7 +1589,6 @@ u8 func0410_labtech_showers_sa_pa[] = { endloop(0x09) label(0x06) - dprint 'T','A','L','K',' ','1','\n',0, speak(CHR_TARGET, L_LIP_037, MP3_032D, CHANNEL_4, COLOR_08_RED) // "Who are you?" restart_timer try_face_entity(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ LABEL_64) @@ -1703,7 +1701,6 @@ u8 func0410_labtech_showers_sa_pa[] = { // Tech saw weapon label(LABEL_53) chr_do_animation(ANIM_SURPRISED_0202, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) - dprint 'T','A','L','K',' ','1','\n',0, speak(CHR_TARGET, L_LIP_041, SFX_8156, CHANNEL_4, COLOR_08_RED) // "Oh, my God - a gun!" restart_timer @@ -1984,7 +1981,6 @@ u8 func0418_doorman[] = { // Disguise not used, or uncovered label(LABEL_2D) - dprint 'T','A','L','K',' ','1','\n',0, speak(CHR_TARGET, L_LIP_051, SFX_8158, CHANNEL_4, COLOR_08_RED) // "Hey, you're not... SECURITY ALERT!" restart_timer stop_chr @@ -2235,7 +2231,6 @@ u8 func041a_labtech_harrysmate[] = { endloop(0x0c) label(0x06) - dprint 'C','R','E','A','T','E','D',' ','W','E','A','P','\n',0, try_equip_weapon(MODEL_CHRDRUGGUN, WEAPON_TRANQUILIZER, 0x10000000, /*goto*/ 0x06) label(0x06) #if VERSION >= VERSION_NTSC_1_0 @@ -2327,7 +2322,6 @@ u8 func041b_labtech_keycardguy[] = { endloop(0x0a) label(0x06) - dprint 'C','R','E','A','T','E','D',' ','W','E','A','P','\n',0, try_equip_weapon(MODEL_CHRDRUGGUN, WEAPON_TRANQUILIZER, 0x10000000, /*goto*/ 0x06) label(0x06) #if VERSION >= VERSION_NTSC_1_0 @@ -2463,7 +2457,6 @@ u8 func1010_give_keycard[] = { if_chr_death_animation_finished(0x23, /*goto*/ 0x06) if_chr_knockedout(0x23, /*goto*/ 0x06) give_object_to_chr(0x10, 0x23) - dprint 'G','I','V','E',' ','T','O','4',0, goto_next(LABEL_2D) label(0x06) @@ -2471,7 +2464,6 @@ u8 func1010_give_keycard[] = { if_chr_death_animation_finished(0x24, /*goto*/ 0x06) if_chr_knockedout(0x24, /*goto*/ 0x06) give_object_to_chr(0x10, 0x24) - dprint 'G','I','V','E',' ','T','O','5',0, goto_next(LABEL_2D) label(0x06) @@ -2479,14 +2471,12 @@ u8 func1010_give_keycard[] = { if_chr_death_animation_finished(0x25, /*goto*/ 0x06) if_chr_knockedout(0x25, /*goto*/ 0x06) give_object_to_chr(0x10, 0x25) - dprint 'G','I','V','E',' ','T','O','6',0, goto_next(LABEL_2D) label(0x06) if_chr_death_animation_finished(0x26, /*goto*/ LABEL_2D) if_chr_dead(0x26, /*goto*/ LABEL_2D) if_chr_knockedout(0x26, /*goto*/ LABEL_2D) - dprint 'G','I','V','E',' ','T','O','7',0, label(LABEL_2D) unset_object_flag2(0x10, OBJFLAG2_INVISIBLE) @@ -2585,7 +2575,6 @@ u8 func0413_mechanic[] = { endloop(0x09) label(0x06) - dprint 'T','A','L','K',' ','1','\n',0, speak(CHR_BOND, L_LIP_065, SFX_M0_GET_THE_HELL_OUT_OF_HERE, CHANNEL_4, COLOR_08_RED) // "Get the hell out of here!" restart_timer chr_do_animation(ANIM_SURRENDER_002E, 0, -1, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) @@ -2650,11 +2639,9 @@ u8 func0415_warehouse_spawner[] = { reloop(0x04) label(0x08) - dprint 'H','E','A','R','S','P','A','W','N','\n',0, label(LABEL_2D) if_never_been_onscreen(/*goto*/ LABEL_4E) - dprint 'N','E','V','E','R',' ','V','I','S','F','A','I','L','\n',0, if_can_see_target(/*goto*/ 0x08) reloop(0x04) @@ -2665,14 +2652,11 @@ u8 func0415_warehouse_spawner[] = { set_ailist(CHR_SELF, GAILIST_ALERTED) label(LABEL_4E) - dprint 'C','H','E','C','K',' ','D','U','P','E','\n',0, if_chr_death_animation_finished(CHR_CLONE, /*goto*/ LABEL_4E) reloop(0x04) label(LABEL_4E) - dprint 'C','R','E','A','T','E',' ','S','P','A','W','N','\n',0, try_spawn_clone2(CHR_SELF, AILIST_WAREHOUSE_CLONE, 0, /*goto*/ LABEL_2D) - dprint 'C','R','E','A','T','E',' ','F','A','I','L','\n',0, reloop(0x04) label(LABEL_2D) @@ -2879,7 +2863,6 @@ u8 func041f_labtech_lights[] = { // Jo in sight label(0x03) object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) - dprint 'T','A','L','K',' ','0','\n',0, if_self_flag_bankx_eq(CHRFLAG0_SKIPSAFETYCHECKS, TRUE, BANK_0, /*goto*/ LABEL_53) restart_timer label(0x08) @@ -2891,7 +2874,6 @@ u8 func041f_labtech_lights[] = { endloop(0x09) label(0x06) - dprint 'T','A','L','K',' ','1','\n',0, if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISE_UNCOVERED, /*goto*/ 0x06) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISED, /*goto*/ LABEL_2D) label(0x06) @@ -3120,18 +3102,14 @@ u8 func0420_labtech_doors[] = { endloop(0x09) label(0x06) - dprint 'T','A','L','K',' ','1','\n',0, if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISE_UNCOVERED, /*goto*/ 0x06) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISED, /*goto*/ LABEL_2D) label(0x06) - dprint 'T','A','L','K',' ','2','\n',0, goto_next(0x06) label(LABEL_2D) - dprint 'T','A','L','K',' ','3','\n',0, if_chr_weapon_equipped(CHR_TARGET, WEAPON_NONE, /*goto*/ LABEL_2D) if_chr_weapon_equipped(CHR_TARGET, WEAPON_UNARMED, /*goto*/ LABEL_2D) - dprint 'T','A','L','K',' ','4','\n',0, goto_next(0x06) label(LABEL_2D) @@ -3142,7 +3120,6 @@ u8 func0420_labtech_doors[] = { beginloop(LABEL_7B) if_saw_injury(0x00, /*goto*/ LABEL_89) if_saw_death(0x00, /*goto*/ LABEL_89) - dprint 'T','A','L','K',' ','5','\n',0, if_chr_not_talking(CHR_SELF, /*goto*/ LABEL_2D) endloop(LABEL_7B) @@ -3214,7 +3191,6 @@ u8 func0420_labtech_doors[] = { endloop(LABEL_73) label(0x06) - dprint 'F','L','A','G',' ','S','E','T','\n',0, label(0x10) chr_do_animation(ANIM_COWER_0229, -1, -1, CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) @@ -3367,7 +3343,6 @@ u8 func0422_labtech_records[] = { endloop(LABEL_79) label(LABEL_2D) - dprint 'T','A','L','K',' ','1','\n',0, speak(CHR_TARGET, L_LIP_086, SFX_M1_WARN_THE_OTHERS, CHANNEL_4, COLOR_08_RED) // "Warn the others..." label(LABEL_2D) label(0x06) @@ -3378,7 +3353,6 @@ u8 func0422_labtech_records[] = { endloop(0x0a) label(0x06) - dprint 'F','L','A','G',' ','S','E','T','\n',0, label(0x10) chr_do_animation(ANIM_COWER_0229, -1, -1, CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) @@ -4315,7 +4289,6 @@ u8 func0429_spawn_while_xraying[] = { reloop(0x04) label(0x06) - dprint 'O','B','J','E','C','T','I','V','E',' ','D','O','N','E','\n',0, label(LABEL_4E) if_chr_death_animation_finished(CHR_CLONE, /*goto*/ LABEL_4E) reloop(0x04) @@ -4497,11 +4470,9 @@ u8 func1027_check_disguise_worn[] = { u8 func1028_toggle_mechanic[] = { if_savefile_flag_is_set(GAMEFILEFLAG_RESCUE_MECHANIC_DEAD, /*goto*/ 0x06) - dprint 'K','E','E','P',' ','M','E','C','H','\n',0, set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) - dprint 'D','E','L','E','T','E',' ','M','E','C','H','\n',0, disable_chr(CHR_MECHANIC) set_ailist(CHR_SELF, GAILIST_IDLE) endlist diff --git a/src/setups/setuplue.c b/src/setups/setuplue.c index aa3b529c7..28582dc86 100644 --- a/src/setups/setuplue.c +++ b/src/setups/setuplue.c @@ -1574,7 +1574,6 @@ u8 func0417_traitor[] = { label(0x2e) try_attack_stand(ATTACKFLAG_AIMATTARGET | ATTACKFLAG_AIMONLY, 0, /*goto*/ 0x0a) - dprint 'S','H','O','O','T','F','A','I','L','E','D','\n',0, yield label(0x0a) try_modify_attack(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x0b) @@ -1763,7 +1762,6 @@ u8 func040a_top_interceptor[] = { // Unreachable label(0x5a) - dprint 'C','H','A','N','G','E',' ','T','O',' ','L','O','W','\n',0, goto_first(0x09) label(0x59) @@ -2701,7 +2699,6 @@ u8 func0419_clone_spawner[] = { reloop(0x04) label(0x2e) - dprint 'O','B','J','E','C','T','I','V','E',' ','D','O','N','E','\n',0, if_never_been_onscreen(/*goto*/ 0x4f) if_can_see_target(/*goto*/ 0x09) reloop(0x04) @@ -2749,7 +2746,6 @@ u8 func1019_spawn_guards_at_antenna[] = { // (two guards near antenna blue door) // SA and PA: Wait until bug thrown on antenna beginloop(0x04) - dprint 'C','H','E','C','K',' ','F','O','R',' ','O','B','J','E','C','T','I','V','E','\n',0, if_difficulty_lt(DIFF_SA, /*goto*/ 0x06) if_objective_complete(1, /*goto*/ 0x2e) reloop(0x04) @@ -2772,14 +2768,12 @@ u8 func1019_spawn_guards_at_antenna[] = { set_morale(3) beginloop(0x56) - dprint 'T','R','Y',' ','C','R','E','A','T','E','\n',0, if_morale_lt(1, /*goto*/ 0x06) try_spawn_chr_at_pad(BODY_A51TROOPER, HEAD_RANDOM, PAD_LUE_00A0, AILIST_SPAWNED_GUARD, SPAWNFLAG_00000200, /*goto*/ 0x57) reloop(0x56) label(0x57) yield - dprint 'C','R','E','A','T','E','\n',0, subtract_morale(1) restart_timer @@ -2884,7 +2878,6 @@ u8 func101a_check_mechanic_dead[] = { label(0x2e) set_savefile_flag(GAMEFILEFLAG_RESCUE_MECHANIC_DEAD) - dprint 'D','E','L','E','T','E',' ','M','E','C','H','\n',0, set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; diff --git a/src/setups/setupoat.c b/src/setups/setupoat.c index b0d3e967c..163832a33 100644 --- a/src/setups/setupoat.c +++ b/src/setups/setupoat.c @@ -55,7 +55,6 @@ u8 func0404_spawn_enemies[] = { // Spawn 12 enemies set_chr_team(CHR_SELF, TEAM_ENEMY) restart_timer - dprint 'B','4','C','H','E','C','K','\n',0, set_morale(12) label(0x04) if_morale_lt(1, /*goto*/ 0x01) @@ -95,7 +94,6 @@ u8 func0405_spawn_maians[] = { set_chr_team(CHR_SELF, TEAM_ALLY) stop_chr restart_timer - dprint 'B','4','C','H','E','K','\n',0, set_morale(12) label(0x04) if_morale_lt(1, /*goto*/ 0x01) @@ -148,7 +146,6 @@ u8 unregistered_function1[] = { goto_first(0x04) label(0x01) - dprint 't',0, goto_first(0x04) endlist @@ -176,7 +173,6 @@ u8 func0407_defend_pad[] = { jog_to_pad(PAD_PRESET) label(0xdc) yield - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0xa5) if_chr_distance_to_pad_lt(CHR_SELF, 200, PAD_PRESET, /*goto*/ 0x01) goto_first(0xdc) @@ -186,7 +182,6 @@ u8 func0407_defend_pad[] = { stop_chr label(0xa6) yield - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0xa5) if_chr_distance_to_pad_gt(CHR_SELF, 300, PAD_PRESET, /*goto*/ 0x01) goto_first(0xa6) @@ -196,7 +191,6 @@ u8 func0407_defend_pad[] = { // Do combat label(0xa5) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, 0x0407) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) endlist diff --git a/src/setups/setuppam.c b/src/setups/setuppam.c index 182ed45c3..f8479f86b 100644 --- a/src/setups/setuppam.c +++ b/src/setups/setuppam.c @@ -720,7 +720,6 @@ s32 path10[] = { }; u8 func0401_unused[] = { - dprint 'h','o','v','\n',0, begin_hovercar_path(0x00) set_vehicle_speed(384, 120) @@ -757,7 +756,6 @@ u8 func040b_init_elvis[] = { }; u8 func0402_elvis_follow_and_reactive_teleportals[] = { - dprint 'B','A','C','K',' ','T','O',' ','E','L','V','I','S','\n',0, set_returnlist(CHR_SELF, AILIST_ELVIS_FOLLOW_AND_REACTIVATE_TELEPORTALS) set_shotlist(AILIST_ELVIS_FOLLOW_AND_REACTIVATE_TELEPORTALS) set_target_chr(CHR_PRESET) @@ -803,7 +801,6 @@ u8 func0402_elvis_follow_and_reactive_teleportals[] = { // Jo distance >= 200 label(0x03) - dprint 'G','O','T','O','W','\n',0, set_target_chr(CHR_PRESET) restart_timer if_distance_to_target_gt(300, /*goto*/ 0x06) @@ -988,7 +985,6 @@ u8 func0404_elvis_follow_and_do_agent_megaweapon[] = { if_stage_flag_eq(STAGEFLAG_AGENT_MEGAWEAPON_DISABLED, TRUE, /*goto*/ 0x2e) if_chr_in_room(CHR_ELVIS, 0x00, 0x006c, /*goto*/ 0x1d) label(0x2e) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2000, /*goto*/ 0x08) set_target_chr(CHR_PRESET) if_distance_to_target_lt(200, /*goto*/ 0x06) @@ -1002,11 +998,9 @@ u8 func0404_elvis_follow_and_do_agent_megaweapon[] = { stop_chr beginloop(0x09) - dprint 'B','4',' ','P','A','D','\n',0, if_stage_flag_eq(STAGEFLAG_AGENT_MEGAWEAPON_DISABLED, TRUE, /*goto*/ 0x2e) if_chr_in_room(CHR_ELVIS, 0x00, 0x006c, /*goto*/ 0x1d) label(0x2e) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2000, /*goto*/ 0x08) set_target_chr(CHR_PRESET) if_distance_to_target_gt(300, /*goto*/ 0x06) @@ -1016,7 +1010,6 @@ u8 func0404_elvis_follow_and_do_agent_megaweapon[] = { goto_first(0x03) label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, call_rng if_rand_lt(85, /*goto*/ 0x63) if_rand_lt(170, /*goto*/ 0x64) @@ -1123,7 +1116,6 @@ u8 func0405_elvis_follow_nocombat[] = { beginloop(0x04) label(0x2e) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(300, /*goto*/ 0x08) set_target_chr(CHR_PRESET) if_distance_to_target_lt(200, /*goto*/ 0x06) @@ -1137,9 +1129,7 @@ u8 func0405_elvis_follow_nocombat[] = { stop_chr beginloop(0x09) - dprint 'B','4',' ','P','A','D','\n',0, label(0x2e) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2000, /*goto*/ 0x08) set_target_chr(CHR_PRESET) if_distance_to_target_gt(300, /*goto*/ 0x06) @@ -1319,7 +1309,6 @@ u8 func0407_elvis_go_to_sa_teleport[] = { label(0x06) restart_timer label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, call_rng if_rand_lt(85, /*goto*/ 0x63) if_rand_lt(170, /*goto*/ 0x64) @@ -1378,7 +1367,6 @@ u8 func0403_elvis_give_farsight[] = { try_run_to_target(/*goto*/ 0x04) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, set_target_chr(CHR_PRESET) if_distance_to_target_lt(200, /*goto*/ 0x06) if_timer_gt(60, /*goto*/ 0x2e) @@ -1858,12 +1846,10 @@ u8 func042d_elvis_warp_to_outside_drcaroll[] = { stop_chr beginloop(0x04) - dprint 'T','E','L','E','P','O','R','T',' ','F','A','I','L','E','D','\n',0, chr_move_to_pad(CHR_ELVIS, PAD_PAM_0017, 0x01, /*goto*/ 0x2e) endloop(0x04) label(0x2e) - dprint 'T','E','L','E','P','O','R','T',' ','G','O','O','D','\n',0, set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) stop_chr set_ailist(CHR_SELF, AILIST_ELVIS_RUN_TO_EXIT) @@ -1894,7 +1880,6 @@ u8 func0c02_outro[] = { if_timer_gt(time, /*goto*/ 0x2e) \ endloop(loopid) \ label(0x2e) \ - dprint msg, '\n', 0, \ enable_object(mine) \ yield \ move_object_to_pad(mine, pad) \ @@ -1906,7 +1891,6 @@ u8 func0c02_outro[] = { if_timer_gt(time, /*goto*/ 0x2e) \ endloop(loopid) \ label(0x2e) \ - dprint msg1, msg2, '\n', 0, \ enable_object(mine) \ yield \ move_object_to_pad(mine, pad) \ @@ -1941,7 +1925,6 @@ u8 func0c02_outro[] = { endloop(0x7c) label(0x2e) - dprint '2','3','\n',0, blow_mine2(1038, 0x7d, '2','4', 0x8d, 0x0275) blow_mine2(1071, 0x7e, '2','5', 0x8e, 0x0274) @@ -3168,9 +3151,7 @@ u8 func041d_sniper[] = { beginloop(0x63) chr_toggle_p1p2(CHR_SELF) if_can_see_target(/*goto*/ 0x2e) - dprint 'N','O',' ','P','L','A','Y','E','R',' ','T','A','R','G','E','T','\n',0, if_enemy_distance_lt_and_los(1000, /*goto*/ 0x2f) - dprint 'N','O',' ','O','P','P','\n',0, goto_next(0x2f) label(0x2e) @@ -3180,13 +3161,11 @@ u8 func041d_sniper[] = { goto_next(0x2e) label(0x2f) - dprint 'T','H','E',' ','P','L','A','Y','E','R',' ','i','s',' ','i','t','\n',0, if_timer_gt(180, /*goto*/ 0x06) if_chr_stopped(/*goto*/ 0x06) endloop(0x63) label(0x06) - dprint '1','\n',0, stop_chr call_rng if_rand_gt(128, /*goto*/ 0x06) @@ -3197,7 +3176,6 @@ u8 func041d_sniper[] = { endloop(0x0e) label(0x06) - dprint '2','\n',0, set_chrpreset(CHR_TARGET) goto_next(0x06) @@ -3206,17 +3184,13 @@ u8 func041d_sniper[] = { goto_next(0x06) label(0x2e) - dprint 'C','H','E','C','K',' ','P','L','A','Y','E','R',' ','D','I','R','\n',0, if_within_targets_fovx_by_angle(20, /*goto*/ 0x0d) - dprint '3','\n',0, label(0x06) if_can_see_target(/*goto*/ 0x2e) - dprint '4','\n',0, goto_next(0x0d) label(0x2e) restart_timer - dprint '5','\n',0, set_chr_cloaked(CHR_SELF, FALSE, TRUE) label(0x0a) label(0x2e) @@ -3366,7 +3340,6 @@ u8 func100f_check_drcaroll_dead[] = { }; u8 func040f_miniskedar_send_clones[] = { - dprint 'D','E','T','E','C','T','E','D','\n',0, set_self_chrflag(CHRCFLAG_CLONEABLE) set_self_chrflag(CHRCFLAG_HIDDEN) set_self_chrflag(CHRCFLAG_00040000) @@ -3462,7 +3435,6 @@ u8 func040f_miniskedar[] = { label(0x30) restart_timer - dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0, stop_chr try_face_entity(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x0b) @@ -3594,7 +3566,6 @@ u8 func1012_sa_megaweapon_spawner[] = { restart_timer beginloop(0x20) - dprint 'T','I','M','E','\n',0, if_stage_flag_eq(STAGEFLAG_MEGAWEAPON_DISABLED, TRUE, /*goto*/ 0x06) // Megaweapon not disabled yet - spawn every 8 seconds @@ -3607,7 +3578,6 @@ u8 func1012_sa_megaweapon_spawner[] = { // Consider spawn label(0x2e) - dprint 'S','Q','U','A','D','\n',0, if_num_chrs_in_squadron_gt(5, 0x0e, /*goto*/ 0x21) call_rng if_rand_gt(86, /*goto*/ 0x63) @@ -4011,10 +3981,8 @@ u8 func101f_pa_circleroom_spawner[] = { beginloop(0x20) chr_toggle_p1p2(CHR_SELF) if_chr_in_room(CHR_P1P2, 0x00, 0x008c, /*goto*/ 0x58) - dprint 'T','I','M','E','\n',0, if_timer_lt(300, /*goto*/ 0x21) label(0x2e) - dprint 'S','Q','U','A','D','\n',0, if_num_chrs_in_squadron_gt(3, 0x0d, /*goto*/ 0x21) call_rng if_rand_gt(128, /*goto*/ 0x63) @@ -4061,10 +4029,8 @@ u8 func1020_pa_deadendroom_spawner[] = { restart_timer beginloop(0x20) - dprint 'T','I','M','E','\n',0, if_timer_lt(300, /*goto*/ 0x21) label(0x2e) - dprint 'S','Q','U','A','D','\n',0, if_num_chrs_in_squadron_gt(3, 0x0b, /*goto*/ 0x21) call_rng if_rand_gt(64, /*goto*/ 0x63) @@ -4359,7 +4325,6 @@ u8 func042e_elvis_run_to_exit[] = { goto_first(0x1f) label(0x2e) - dprint 'D','E','T','E','C','T','E','D','\n',0, call_rng if_rand_lt(85, /*goto*/ 0x63) if_rand_lt(170, /*goto*/ 0x64) diff --git a/src/setups/setuppete.c b/src/setups/setuppete.c index 7fac66cdc..54d309ee5 100644 --- a/src/setups/setuppete.c +++ b/src/setups/setuppete.c @@ -718,7 +718,6 @@ u8 func100f_check_mine[] = { set_target_chr(CHR_P1P2) beginloop(0x11) - dprint 'M','A','I','N','\n',0, if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x29) if_chr_dead(CHR_TARGET, /*goto*/ 0x29) if_chr_knockedout(CHR_TARGET, /*goto*/ 0x29) @@ -728,12 +727,10 @@ u8 func100f_check_mine[] = { label(0x29) label(0x54) yield - dprint 'D','E','A','D','\n',0, if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x28) if_chr_dead(CHR_TARGET, /*goto*/ 0x28) if_chr_knockedout(CHR_TARGET, /*goto*/ 0x28) yield - dprint 'N','O','T','D','E','A','D','\n',0, if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_REMOTE_MINE, 1, /*goto*/ 0x29) reloop(0x08) @@ -742,13 +739,10 @@ u8 func100f_check_mine[] = { endloop(0x08) label(0x29) - dprint 'N','O','A','M','M','O','\n',0, label(0x28) - dprint 'S','T','I','L','L','D','E','A','D','\n',0, goto_first(0x54) label(0x03) - dprint 'F','A','I','L','\n',0, yield yield yield @@ -965,7 +959,6 @@ u8 func040c_taxi[] = { label(0x04) label(0x38) - dprint 'G','O',' ','F','O','R',' ','C','R','A','S','H','\n',0, set_stage_flag(STAGEFLAG_TRIGGER_CRASH) yield mute_channel(CHANNEL_0) @@ -989,7 +982,6 @@ u8 func040c_taxi[] = { yield \ \ beginloop(0x11) \ - dprint 'B','U','G',' ','C','1','\n',0, \ set_target_chr(chr2) \ if_chr_death_animation_finished(chr, /*goto*/ 0x2f) \ if_chr_dead(chr, /*goto*/ 0x2f) \ @@ -1000,7 +992,6 @@ u8 func040c_taxi[] = { \ /* Dead - not sure why it checks this a second time */ \ beginloop(0x2f) \ - dprint 'B','U','G',' ','D','O','\n',0, \ set_target_chr(chr2) \ if_chr_death_animation_finished(chr, /*goto*/ 0x30) \ if_chr_dead(chr, /*goto*/ 0x30) \ @@ -1018,7 +1009,6 @@ u8 func040c_taxi[] = { \ /* Alive but has no bug */ \ label(0x03) \ - dprint 'B','U','G',' ','C','2','\n',0, \ yield \ if_weapon_thrown(WEAPON_TRACERBUG, /*goto*/ 0x04) \ goto_first(0x03) \ @@ -1032,7 +1022,6 @@ u8 func040c_taxi[] = { restart_timer \ \ beginloop(0x05) \ - dprint 'B','U','G',' ','C','3','\n',0, \ if_weapon_thrown_on_object(WEAPON_TRACERBUG, OBJ_LIMO, /*goto*/ 0x06) \ if_timer_gt(120, /*goto*/ 0x07) \ endloop(0x05) \ @@ -1044,7 +1033,6 @@ u8 func040c_taxi[] = { restart_timer \ \ beginloop(0x08) \ - dprint 'B','U','G',' ','C','4','\n',0, \ if_timer_gt(300, /*goto*/ 0x04) \ goto_first(0x08) \ \ @@ -1054,14 +1042,11 @@ u8 func040c_taxi[] = { \ /* Bug wasted */ \ label(0x07) \ - dprint 'W','R','O','N','G','1','\n',0, \ if_stage_flag_eq(STAGEFLAG_ONE_BUG_REMAINING, TRUE, /*goto*/ 0x03) \ - dprint 'W','R','O','N','G','2','\n',0, \ set_stage_flag(STAGEFLAG_ONE_BUG_REMAINING) \ set_ailist(CHR_SELF, GAILIST_IDLE) \ \ label(0x03) \ - dprint 'W','R','O','N','G','3','\n',0, \ set_stage_flag(STAGEFLAG_TRACERBUG_WASTED) \ show_hudmsg(chr, 0x3218) /* "Tracer Bug placed incorrectly." */ \ set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1148,13 +1133,11 @@ u8 func1006_check_for_end[] = { reloop(0x05) label(0x0a) - dprint 'P','A','D',' ','C','H','E','C','K','\n',0, if_chr_distance_to_pad_lt(CHR_P1P2, 350, PAD_PETE_00A7, /*goto*/ 0x04) endloop(0x05) label(0x04) set_stage_flag(STAGEFLAG_IN_ELEVATOR) - dprint 'I','N',' ','T','H','E',' ','E','L','E','V','A','T','O','R','\n',0, yield yield set_invincible(CHR_BOND) @@ -1236,7 +1219,6 @@ u8 func040d_limo_timing[] = { // Ready to leave label(0x04) set_stage_flag(STAGEFLAG_LIMO_READY_TO_LEAVE) - dprint 'L','I','M','O',' ','R','E','A','D','Y',' ','T','O',' ','G','O','\n',0, restart_timer // Wait 15 seconds @@ -1314,20 +1296,17 @@ u8 func0412_cia[] = { beginloop(0x43) if_saw_death(0x00, /*goto*/ 0x1d) if_saw_injury(0x00, /*goto*/ 0x1e) - dprint 'D','U','R','I','N','G','T','A','L','K','\n',0, if_timer_gt(180, /*goto*/ 0x04) endloop(0x43) // Idle + 3 seconds label(0x04) if_self_flag_bankx_eq(CHRFLAG0_FORCESAFETYCHECKS, TRUE, BANK_0, /*goto*/ 0x54) - dprint 'N','O','T',' ','A',' ','P','A','T','R','O','L','L','E','R','\n',0, stop_chr goto_next(0x10) // Patroller label(0x54) - dprint 'P','A','T',' ','R','E','T','\n',0, start_patrol // Not shot, not a patroller, or patroller who has started his path @@ -1430,7 +1409,6 @@ u8 func0412_cia[] = { if_timer_lt(600, /*goto*/ 0x03) unset_self_flag_bankx(CHRFLAG0_SKIPSAFETYCHECKS, BANK_0) label(0x03) - dprint 'L','I','M','O',' ','R','E','A','D','Y',' ','T','O',' ','G','O','\n',0, goto_first(0x10) label(0x1e) @@ -1843,7 +1821,6 @@ u8 func041d_fbi[] = { set_ailist(CHR_SELF, GAILIST_ALERTED) label(0x04) - dprint 'T','R','A','C','K',' ','P','L','A','Y','E','R','\n',0, try_jog_to_target(/*goto*/ 0x06) beginloop(0x06) @@ -1883,13 +1860,11 @@ u8 func041d_fbi[] = { endloop(0x0e) label(0x04) - dprint 'C','R','E','A','T','E','D',' ','W','E','A','P','\n',0, try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x10000000, /*goto*/ 0x04) label(0x04) yield set_stage_flag(STAGEFLAG_ALARM_SOUNDED) activate_alarm - dprint 'C','R','E','A','T','E','D',' ','W','E','A','P','\n',0, set_ailist(CHR_SELF, GAILIST_ALERTED) endlist }; @@ -2070,7 +2045,6 @@ u8 func041a_robot[] = { chr_do_animation(ANIM_016A, 0, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SELF, 4) beginloop(0x2d) - dprint 'P','A','R','T',' ','4','\n',0, if_chr_stopped(/*goto*/ 0x04) goto_first(0x2d) @@ -2536,10 +2510,8 @@ u8 func040a_intro_sfx[] = { unset_stage_flag(STAGEFLAG_TRIGGER_INTRO) label(0x10) yield - dprint 'C','U','T','S','C','E','N','E',' ','S','T','A','R','T','E','D','\n',0, label(0x03) restart_timer - dprint 'C','U','T','S','C','E','N','E',' ','S','T','A','R','T','E','D','\n',0, #define wait_until(time, loopid) \ beginloop(loopid) \ diff --git a/src/setups/setuprit.c b/src/setups/setuprit.c index d6d0b6c31..d29ea1102 100644 --- a/src/setups/setuprit.c +++ b/src/setups/setuprit.c @@ -627,7 +627,6 @@ u8 func1004_reassign_ailists_during_conversation[] = { endloop(0x04) label(0x06) - dprint 'b','4',' ','s','h','i','e','l','d',' ','c','h','e','c','k','\n',0, set_stage_flag(STAGEFLAG_00100000) set_chr_target_chr(CHR_PRESIDENT, CHR_P1P2) set_ailist(0x01, AILIST_BE_UNALERT) @@ -1474,7 +1473,6 @@ u8 func0404_president_running[] = { // Alive label(0x2d) - dprint 'b','4',' ','s','h','i','e','l','d',' ','c','h','e','c','k','\n',0, if_just_injured(CHR_SELF, /*goto*/ 0x06) goto_next(0x55) @@ -1516,7 +1514,6 @@ u8 func0404_president_running[] = { if_chr_in_room(CHR_TARGET, 0x00, 0x0030, /*goto*/ 0x11) if_chr_in_room(CHR_TARGET, 0x00, 0x0031, /*goto*/ 0x11) if_chr_in_room(CHR_TARGET, 0x00, 0x0032, /*goto*/ 0x11) - dprint 't','a','r','g','e','t','\n',0, if_can_see_target(/*goto*/ 0x06) goto_next(0x58) @@ -2167,7 +2164,6 @@ u8 func1002_intro[] = { if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0x2d) set_chr_hiddenflag(CHR_COOP, CHRHFLAG_DISGUISED) label(0x2d) - dprint 'D','I','S','G','U','I','S','E','D','\n',0, camera_movement(ANIM_CUT_RIT_INTRO_CAM_03) cmd0175(60) if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0x2d) @@ -2368,7 +2364,6 @@ u8 func040a_defend_pad[] = { jog_to_pad(PAD_PRESET) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_chr_distance_to_pad_lt(CHR_SELF, 200, PAD_PRESET, /*goto*/ 0x06) endloop(0x04) @@ -2377,7 +2372,6 @@ u8 func040a_defend_pad[] = { stop_chr beginloop(0x09) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_chr_distance_to_pad_gt(CHR_SELF, 300, PAD_PRESET, /*goto*/ 0x06) endloop(0x09) @@ -2387,7 +2381,6 @@ u8 func040a_defend_pad[] = { // Detected enemy label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, AILIST_DEFEND_PAD) set_shotlist(AILIST_DEFEND_PAD) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -2406,7 +2399,6 @@ u8 func040b_defend_president[] = { try_jog_to_chr(CHR_PRESIDENT, /*goto*/ 0x04) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_detected_chr(CHR_PRESIDENT, /*goto*/ 0x60) endloop(0x04) @@ -2420,7 +2412,6 @@ u8 func040b_defend_president[] = { stop_chr beginloop(0x09) - dprint 'A','T',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_detected_chr(CHR_PRESIDENT, /*goto*/ 0x60) goto_first(0x04) @@ -2434,7 +2425,6 @@ u8 func040b_defend_president[] = { // Detected enemy label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, AILIST_DEFEND_PRESIDENT) set_shotlist(AILIST_DEFEND_PRESIDENT) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -3587,7 +3577,6 @@ u8 func1019_midcutscene[] = { set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) if_stage_flag_eq(STAGEFLAG_MIDCUTSCENE_STARTED, TRUE, /*goto*/ 0x2d) set_stage_flag(STAGEFLAG_MIDCUTSCENE_STARTED) - dprint 'm','i','d',' ','c','u','t','s','c','e','n','e','\n',0, play_cutscene_track(MUSIC_AIRFORCEONE_MIDCUTSCENE) label(0x2d) camera_movement(ANIM_CUT_RIT_MID_CAM) diff --git a/src/setups/setupsho.c b/src/setups/setupsho.c index 57b67d9cb..e732a1094 100644 --- a/src/setups/setupsho.c +++ b/src/setups/setupsho.c @@ -617,7 +617,6 @@ u8 func0402_unarmed_skedar[] = { label(0x2f) restart_timer - dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0, if_target_in_fov_left(10, /*goto*/ 0x06) if_target_out_of_fov_left(246, /*goto*/ 0x06) stop_chr @@ -808,7 +807,6 @@ u8 func0404_miniskedar[] = { label(0x2f) restart_timer - dprint 'F','A','C','E',' ','T','A','R','G','E','T','\n',0, stop_chr try_face_entity(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x0c) @@ -1212,19 +1210,16 @@ u8 func1007_bug_throws_bond[] = { if_stage_flag_eq(STAGEFLAG_BOND_THREW_THIRD_BUG, FALSE, /*goto*/ 0x57) label(0x55) - dprint 'C','H','E','C','K',' ','1','\n',0, if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_BUG, 3, /*goto*/ 0x2d) endloop(0x03) // Threw first label(0x2d) - dprint 'F','I','R','E',' ','1','\n',0, set_stage_flag(STAGEFLAG_BOND_THREW_FIRST_BUG) goto_next(0x0e) // Check for second label(0x56) - dprint 'C','H','E','C','K',' ','2','\n',0, label(0x2d) if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_BUG, 2, /*goto*/ 0x2d) goto_first(0x03) @@ -1235,7 +1230,6 @@ u8 func1007_bug_throws_bond[] = { // Check for third label(0x57) - dprint 'C','H','E','C','K',' ','3','\n',0, if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_BUG, 1, /*goto*/ 0x2d) goto_first(0x03) @@ -1251,7 +1245,6 @@ u8 func1007_bug_throws_bond[] = { restart_timer beginloop(0x08) - dprint 'A','T',' ','R','E','S','T','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR1_MARKED, TRUE, /*goto*/ 0x2d) if_weapon_thrown_on_object(WEAPON_TARGETAMPLIFIER, OBJ_PILLAR1, /*goto*/ 0x09) label(0x2d) @@ -1265,7 +1258,6 @@ u8 func1007_bug_throws_bond[] = { endloop(0x08) label(0x09) - dprint '1',' ','P','L','A','C','E','D','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR1_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR1_MARKED) show_hudmsg(CHR_BOND, L_SHO_025) // "Target Amplifier placed correctly." @@ -1273,7 +1265,6 @@ u8 func1007_bug_throws_bond[] = { goto_first(0x03) label(0x0b) - dprint '2',' ','P','L','A','C','E','D','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR2_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR2_MARKED) show_hudmsg(CHR_BOND, L_SHO_025) // "Target Amplifier placed correctly." @@ -1281,7 +1272,6 @@ u8 func1007_bug_throws_bond[] = { goto_first(0x03) label(0x0c) - dprint '3',' ','P','L','A','C','E','D','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR3_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR3_MARKED) show_hudmsg(CHR_BOND, L_SHO_025) // "Target Amplifier placed correctly." @@ -1289,7 +1279,6 @@ u8 func1007_bug_throws_bond[] = { goto_first(0x03) label(0x0d) - dprint 'P','L','L','A','C','E','D',' ','W','R','O','N','G','\n',0, if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_COOP_BUGS_WASTED, TRUE, /*goto*/ 0x2d) goto_next(0x0f) @@ -1332,17 +1321,14 @@ u8 func101b_bug_throws_coop[] = { if_stage_flag_eq(STAGEFLAG_COOP_THREW_THIRD_BUG, FALSE, /*goto*/ 0x57) label(0x55) - dprint 'C','O','O','P',' ','C','H','E','C','K',' ','1','\n',0, if_ammo_quantity_lt(CHR_COOP, AMMOTYPE_BUG, 3, /*goto*/ 0x2d) endloop(0x03) label(0x2d) - dprint 'C','O','O','P',' ','F','I','R','E',' ','1','\n',0, set_stage_flag(STAGEFLAG_COOP_THREW_FIRST_BUG) goto_next(0x0e) label(0x56) - dprint 'C','O','O','P',' ','C','H','E','C','K',' ','2','\n',0, label(0x2d) if_ammo_quantity_lt(CHR_COOP, AMMOTYPE_BUG, 2, /*goto*/ 0x2d) goto_first(0x03) @@ -1352,7 +1338,6 @@ u8 func101b_bug_throws_coop[] = { goto_next(0x0e) label(0x57) - dprint 'C','O','O','P',' ','C','H','E','C','K',' ','3','\n',0, if_ammo_quantity_lt(CHR_COOP, AMMOTYPE_BUG, 1, /*goto*/ 0x2d) goto_first(0x03) @@ -1368,7 +1353,6 @@ u8 func101b_bug_throws_coop[] = { restart_timer beginloop(0x08) - dprint 'C','O','O','P',' ','A','T',' ','R','E','S','T','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR1_MARKED, TRUE, /*goto*/ 0x2d) if_weapon_thrown_on_object(WEAPON_TARGETAMPLIFIER, 0x01, /*goto*/ 0x09) label(0x2d) @@ -1382,7 +1366,6 @@ u8 func101b_bug_throws_coop[] = { endloop(0x08) label(0x09) - dprint 'C','O','O','P',' ','1',' ','P','L','A','C','E','D','\n',0, unset_object_flag3(OBJ_PILLAR1, OBJFLAG3_RTRACKED_YELLOW) if_stage_flag_eq(STAGEFLAG_PILLAR1_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR1_MARKED) @@ -1391,7 +1374,6 @@ u8 func101b_bug_throws_coop[] = { goto_first(0x03) label(0x0b) - dprint 'C','O','O','P',' ','2',' ','P','L','A','C','E','D','\n',0, unset_object_flag3(OBJ_PILLAR2, OBJFLAG3_RTRACKED_YELLOW) if_stage_flag_eq(STAGEFLAG_PILLAR2_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR2_MARKED) @@ -1400,7 +1382,6 @@ u8 func101b_bug_throws_coop[] = { goto_first(0x03) label(0x0c) - dprint 'C','O','O','P',' ','3',' ','P','L','A','C','E','D','\n',0, unset_object_flag3(OBJ_PILLAR3, OBJFLAG3_RTRACKED_YELLOW) if_stage_flag_eq(STAGEFLAG_PILLAR3_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR3_MARKED) @@ -1409,7 +1390,6 @@ u8 func101b_bug_throws_coop[] = { goto_first(0x03) label(0x0d) - dprint 'C','O','O','P',' ','P','L','L','A','C','E','D',' ','W','R','O','N','G','\n',0, if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_BUG, 1, /*goto*/ 0x2d) goto_next(0x0f) @@ -1819,7 +1799,6 @@ u8 func0409_reaper_slayer_skedar[] = { label(0x72) try_attack_amount(40, 60) - dprint 'F','I','R','E',' ','F','U','L','L','\n',0, label(0x06) goto_first(0x64) @@ -2170,7 +2149,6 @@ u8 func040d_king_combat[] = { 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, if_target_in_fov_left(10, /*goto*/ 0x06) if_target_out_of_fov_left(246, /*goto*/ 0x06) stop_chr @@ -2187,7 +2165,6 @@ u8 func040d_king_combat[] = { goto_next(0x87) label(0x06) - dprint 'P','U','N','C','H','\n',0, try_punch_or_kick(/*goto*/ 0x0b) goto_next(0x87) @@ -3678,11 +3655,9 @@ u8 unregistered_function1[] = { u8 unregistered_function2[] = { beginloop(0x04) if_object_flag3(OBJ_PUZZLEROCK, OBJFLAG3_PUSHABLE, /*goto*/ 0x2d) - dprint 'C','A','N','T',' ','P','U','S','H','\n',0, reloop(0x04) label(0x2d) - dprint 'C','A','N',' ','P','U','S','H','\n',0, endloop(0x04) endlist diff --git a/src/setups/setupstat.c b/src/setups/setupstat.c index ddb22723b..665c274b5 100644 --- a/src/setups/setupstat.c +++ b/src/setups/setupstat.c @@ -368,7 +368,6 @@ u8 func0401_defend[] = { // Wait until at pad or 1 second has passed beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_chr_distance_to_pad_lt(CHR_SELF, 200, PAD_PRESET, /*goto*/ 0x06) if_timer_gt(60, /*goto*/ 0x2d) @@ -408,7 +407,6 @@ u8 func0401_defend[] = { if_chr_knockedout(CHR_TARGET, /*goto*/ 0x2d) if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x2d) if_chr_dead(CHR_TARGET, /*goto*/ 0x2d) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, AILIST_DEFEND) set_shotlist(AILIST_DEFEND) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) @@ -453,7 +451,6 @@ u8 func1003_spawn_maians[] = { // Successful spawn label(0x8e) - dprint 'C','R','E','A','T','E','D',' ','1','\n',0, yield subtract_morale(1) yield @@ -476,7 +473,6 @@ u8 func1003_spawn_maians[] = { restart_timer beginloop(0x08) - dprint 'S','Q','U','A','D',' ','F','U','L','L','\n',0, if_timer_gt(300, /*goto*/ 0x2d) endloop(0x08) @@ -557,7 +553,6 @@ u8 func0404_maian[] = { try_run_to_target(/*goto*/ 0x04) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) if_chr_dead(CHR_TARGET, /*goto*/ 0x06) if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x06) @@ -570,7 +565,6 @@ u8 func0404_maian[] = { // Maian has line of sight to king label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, if_chr_dead(CHR_TARGET, /*goto*/ 0x06) if_chr_death_animation_finished(CHR_TARGET, /*goto*/ 0x06) if_chr_knockedout(CHR_TARGET, /*goto*/ 0x06) @@ -616,7 +610,6 @@ u8 func1004_spawn_king1_skedar[] = { // Successful spawn label(0x8e) - dprint 'C','R','E','A','T','E','D',' ','1','\n',0, yield subtract_morale(1) yield @@ -641,7 +634,6 @@ u8 func1004_spawn_king1_skedar[] = { beginloop(0x08) if_stage_flag_eq(STAGEFLAG_KING1_DEAD, TRUE, /*goto*/ 0x0e) - dprint 'S','Q','U','A','D',' ','F','U','L','L','\n',0, if_num_chrs_in_squadron_gt(3, GROUP_MAIANS, /*goto*/ 0x2e) if_timer_gt(60, /*goto*/ 0x2d) label(0x2e) @@ -902,12 +894,10 @@ u8 func0406_skedar[] = { try_run_to_target(/*goto*/ 0x04) beginloop(0x04) - dprint 'G','O',' ','T','O',' ','P','A','D','\n',0, if_enemy_distance_lt_and_los(2540, /*goto*/ 0x08) endloop(0x04) label(0x08) - dprint 'D','E','T','E','C','T','E','D','\n',0, set_returnlist(CHR_SELF, AILIST_SKEDAR) set_shotlist(AILIST_SKEDAR) set_ailist(CHR_SELF, GAILIST_COMBAT_WITH_TARGET) diff --git a/src/setups/setuptra.c b/src/setups/setuptra.c index e1b6035e9..8c5a11858 100644 --- a/src/setups/setuptra.c +++ b/src/setups/setuptra.c @@ -923,7 +923,6 @@ u8 func0404_jonathan_following_and_mine[] = { label(0x63) if_stage_flag_eq(STAGEFLAG_JON_SHOT_WHILE_PLANTING, TRUE, /*goto*/ 0x0e) set_target_chr(CHR_P1P2) - dprint 'J','O','N','A',' ','F','O','L','L','O','W','\n',0, label(LABEL_FOLLOW) if_distance_to_target_gt(200, /*goto*/ 0x5c) @@ -2033,7 +2032,6 @@ u8 func100c_medpack_activation[] = { }; u8 func0412_init_elvis[] = { - dprint 'E','L','V','I','S',' ','W','O','K','E','\n',0, stop_chr #if VERSION >= VERSION_NTSC_1_0 set_self_chrflag(CHRCFLAG_PUSHABLE) @@ -2049,7 +2047,6 @@ u8 func0412_init_elvis[] = { }; u8 func040b_elvis_follow[] = { - dprint 'E','L','V','I','S',' ','F','O','L','L','O','W','\n',0, set_target_chr(CHR_JONATHAN) label(0x5a) @@ -2213,14 +2210,12 @@ u8 func1010_check_end_level[] = { label(0x32) #if VERSION < VERSION_NTSC_1_0 - dprint '1','\n',0, #endif if_objective_complete(1, /*goto*/ 0x32) reloop(0x04) label(0x32) #if VERSION < VERSION_NTSC_1_0 - dprint '2','\n',0, #endif if_difficulty_lt(DIFF_SA, /*goto*/ 0x32) if_objective_complete(3, /*goto*/ 0x32) @@ -2228,7 +2223,6 @@ u8 func1010_check_end_level[] = { label(0x32) #if VERSION < VERSION_NTSC_1_0 - dprint '3','\n',0, #endif if_objective_complete(2, /*goto*/ 0x32) reloop(0x04) @@ -2239,18 +2233,15 @@ u8 func1010_check_end_level[] = { label(0x32) #if VERSION < VERSION_NTSC_1_0 - dprint '4','\n',0, #endif if_stage_flag_eq(STAGEFLAG_INNER_DOOR_OPENING, TRUE, /*goto*/ 0x32) reloop(0x04) label(0x32) - dprint '5','\n',0, if_stage_flag_eq(STAGEFLAG_OUTER_DOOR_OPENING, TRUE, /*goto*/ 0x32) reloop(0x04) label(0x32) - dprint '6','\n',0, if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0x0f) if_chr_dead(CHR_ELVIS, /*goto*/ 0x0f) if_chr_knockedout(CHR_ELVIS, /*goto*/ 0x0f) diff --git a/src/setups/setupwax.c b/src/setups/setupwax.c index 413d55af4..3a56255ed 100644 --- a/src/setups/setupwax.c +++ b/src/setups/setupwax.c @@ -1027,7 +1027,6 @@ struct path paths[] = { }; u8 func0401_init_hovercar[] = { - dprint 'h','o','v','\n',0, begin_hovercar_path(0x00) set_vehicle_speed(0x0c00, 120)