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

Discover more commands using chr struct

This commit is contained in:
Ryan Dwyer 2019-09-06 22:31:19 +10:00
parent 81b031f148
commit 0798f65bc3
18 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/globals.s
View File

@ -227,7 +227,7 @@ func0006_unalerted:
if_self_flag_bankx_eq CHRFLAG1_DOINGIDLEANIMATION, TRUE, BANK_1, /*goto*/ 0x13 if_self_flag_bankx_eq CHRFLAG1_DOINGIDLEANIMATION, TRUE, BANK_1, /*goto*/ 0x13
if_self_flag_bankx_eq CHRFLAG1_DISSPEE, FALSE, BANK_1, /*goto*/ 0x15 if_self_flag_bankx_eq CHRFLAG1_DISSPEE, FALSE, BANK_1, /*goto*/ 0x15
dprint "CHECK SOUFI\n" // checks outfit? dprint "CHECK SOUFI\n" // checks outfit?
if_chr_field0x332_zero CHR_SELF, /*goto*/ 0x28 if_chr_propsoundcount_zero CHR_SELF, /*goto*/ 0x28
if_timer_gt 60, /*goto*/ 0x28 if_timer_gt 60, /*goto*/ 0x28
goto_next 0x15 goto_next 0x15
@ -313,7 +313,7 @@ func0006_unalerted:
goto_next 0x14 goto_next 0x14
label 0x15 label 0x15
if_chr_field_0x120 600, OPERATOR_GREATER_THAN, /*goto*/ 0x15 if_chr_soundtimer 600, OPERATOR_GREATER_THAN, /*goto*/ 0x15
goto_next 0xea goto_next 0xea
label 0x14 label 0x14
@ -869,7 +869,7 @@ func0007_alerted:
// is_chr_is_dead_maybe (named wrong) was false // is_chr_is_dead_maybe (named wrong) was false
label 0x16 label 0x16
set_onshot_function GFUNC_ALERTED set_onshot_function GFUNC_ALERTED
set_chr_field_0x356 35 set_aishootingatmel 35
set_unknown_function GFUNC_SEARCH_FOR_PLAYER set_unknown_function GFUNC_SEARCH_FOR_PLAYER
dprint "START LOOP\n" dprint "START LOOP\n"
@ -881,7 +881,7 @@ func0007_alerted:
// Dying // Dying
label 0x16 label 0x16
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_onshot_function GFUNC_IDLE set_onshot_function GFUNC_IDLE
restart_timer restart_timer
@ -937,7 +937,7 @@ func0007_alerted:
if_has_gun CHR_SELF, /*goto*/ 0x1b if_has_gun CHR_SELF, /*goto*/ 0x1b
dprint "LOST MY GUN\n" dprint "LOST MY GUN\n"
label 0xac label 0xac
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
say_quip CHR_JOANNA, 0x21, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00 // "My gun!" say_quip CHR_JOANNA, 0x21, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00 // "My gun!"
stop_chr stop_chr
restart_timer restart_timer
@ -2446,8 +2446,8 @@ func0007_alerted:
// RETREAT // RETREAT
// //
label LABEL_RETREAT label LABEL_RETREAT
set_chr_field_0x35e_0x35f 0, 0x00 set_chr_dodge_rating 0, 0x00
set_chr_field_0x35e_0x35f 1, 0x00 set_chr_dodge_rating 1, 0x00
dprint "ROUTED\n" dprint "ROUTED\n"
set_action ACTION_RETREAT, FALSE set_action ACTION_RETREAT, FALSE
unset_self_flag_bankx CHRFLAG1_00040000, BANK_1 unset_self_flag_bankx CHRFLAG1_00040000, BANK_1
@ -3713,7 +3713,7 @@ func001a_maybe_unset_disspee:
// Wait 1 second, or for some field in the current chr to change. // Wait 1 second, or for some field in the current chr to change.
label 0x13 label 0x13
if_timer_lt 60, /*goto*/ 0x15 if_timer_lt 60, /*goto*/ 0x15
if_chr_field0x332_zero CHR_SELF, /*goto*/ 0x28 if_chr_propsoundcount_zero CHR_SELF, /*goto*/ 0x28
goto_next 0x15 goto_next 0x15
// Field changed // Field changed
@ -4249,12 +4249,12 @@ func001d_search_for_player:
set_chr_special_death_animation CHR_SELF, NULL set_chr_special_death_animation CHR_SELF, NULL
label 0x13 label 0x13
dprint "SEARCH ROOM\n" dprint "SEARCH ROOM\n"
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
label 0x00 label 0x00
set_target_chr FOLLOW_CHR set_target_chr FOLLOW_CHR
set_self_flag_bankx CHRFLAG1_01000000, BANK_1 set_self_flag_bankx CHRFLAG1_01000000, BANK_1
if_self_flag_bankx_eq CHRFLAG1_10000000, TRUE, BANK_1, /*goto*/ 0x16 if_self_flag_bankx_eq CHRFLAG1_10000000, TRUE, BANK_1, /*goto*/ 0x16
set_chr_field_0x330 set_chr_roomtosearch
if_chr_distance_gt 1000, /*goto*/ 0x13 if_chr_distance_gt 1000, /*goto*/ 0x13
try_run_to_target_chr_with_hand_up /*goto*/ 0x03 try_run_to_target_chr_with_hand_up /*goto*/ 0x03
label 0x13 label 0x13
@ -4853,7 +4853,7 @@ func002b_do_something_and_wait:
* Not used. * Not used.
*/ */
func0022_comment_on_player_dead: func0022_comment_on_player_dead:
set_chr_field_0x356 0 set_aishootingatmel 0
dprint "KILL\n" dprint "KILL\n"
stop_chr stop_chr
@ -4902,7 +4902,7 @@ func0023_dodge:
// Dying // Dying
label 0x16 label 0x16
set_chr_field_0x356 0 set_aishootingatmel 0
set_function CHR_SELF, GFUNC_IDLE set_function CHR_SELF, GFUNC_IDLE
label 0x13 label 0x13

24
asm/include/commands.inc
View File

@ -1369,7 +1369,7 @@
.byte \label .byte \label
.endm .endm
// Does some math on chr fields 0x1a0 and 0x290, possibly involving square roots. // Does some math on chr's bdlist, possibly involving square roots.
// If result is > 50, goto label // If result is > 50, goto label
.macro if_distance_to_home_gt_50_maybe label .macro if_distance_to_home_gt_50_maybe label
.short 0x012c .short 0x012c
@ -1748,7 +1748,8 @@
.byte \label .byte \label
.endm .endm
// Involves a call to the RNG, and zeroing chr props 0x160 through 0x016c // Involves a call to the RNG, and zeroing chr fields aimendlshoulder,
// aimendrshoulder, aimendback and amendsideback.
// //
// Called with values: // Called with values:
// 0x5a64 (23140) // 0x5a64 (23140)
@ -1771,8 +1772,7 @@
.short 0x0185 .short 0x0185
.endm .endm
// 0258 01 15 .macro if_chr_soundtimer value operator label
.macro if_chr_field_0x120 value operator label
.short 0x0186 .short 0x0186
.short \value .short \value
.byte \operator .byte \operator
@ -1864,8 +1864,8 @@
.byte \animation .byte \animation
.endm .endm
// Copies a value from the chr's position struct into the chr struct itself // Copies the room from the chr's position struct into the chr struct itself
.macro set_chr_field_0x330 .macro set_chr_roomtosearch
.short 0x01a1 .short 0x01a1
.endm .endm
@ -1887,7 +1887,7 @@
.short \text .short \text
.endm .endm
.macro if_chr_field0x332_zero chr label .macro if_chr_propsoundcount_zero chr label
.short 0x01a7 .short 0x01a7
.byte \chr .byte \chr
.byte \label .byte \label
@ -2009,7 +2009,7 @@
.byte \chr .byte \chr
.endm .endm
.macro set_chr_field_0x356 value .macro set_aishootingatmel value
.short 0x01c2 .short 0x01c2
.short \value .short \value
.endm .endm
@ -2028,16 +2028,16 @@
.endm .endm
// Sets a field in the chr struct // Sets a field in the chr struct
// If whichprop is 0, set field 0x35e // If whichprop is 0, set dodgerating
// If whichprop is 1, set field 0x35f // If whichprop is 1, set maxdodgerating
// If whichprop is 2, set both // If whichprop is 2, set both
.macro set_chr_field_0x35e_0x35f value whichprop .macro set_chr_dodge_rating value whichprop
.short 0x01c6 .short 0x01c6
.byte \value .byte \value
.byte \whichprop .byte \whichprop
.endm .endm
.macro set_chr_field0x360 value .macro set_unarmeddodgerating value
.short 0x01c7 .short 0x01c7
.byte \value .byte \value
.endm .endm

20
asm/setup/setupame.s
View File

@ -1070,8 +1070,8 @@ func0409_start_path30:
do_path 30 do_path 30
func040a_start_path31: func040a_start_path31:
set_chr_field_0x35e_0x35f 2, 0x14 set_chr_dodge_rating 2, 0x14
set_chr_field0x360 0 set_unarmeddodgerating 0
set_accuracy 0 set_accuracy 0
set_reaction_speed 0 set_reaction_speed 0
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1085,8 +1085,8 @@ func040a_start_path31:
endfunction endfunction
func040b_start_path32: func040b_start_path32:
set_chr_field_0x35e_0x35f 2, 0x14 set_chr_dodge_rating 2, 0x14
set_chr_field0x360 0 set_unarmeddodgerating 0
set_accuracy 0 set_accuracy 0
set_reaction_speed 0 set_reaction_speed 0
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1099,8 +1099,8 @@ func040b_start_path32:
endfunction endfunction
func040c_start_path33: func040c_start_path33:
set_chr_field_0x35e_0x35f 2, 0x14 set_chr_dodge_rating 2, 0x14
set_chr_field0x360 0 set_unarmeddodgerating 0
set_accuracy 0 set_accuracy 0
set_reaction_speed 0 set_reaction_speed 0
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1113,8 +1113,8 @@ func040c_start_path33:
endfunction endfunction
func040d_start_path34: func040d_start_path34:
set_chr_field_0x35e_0x35f 2, 0x14 set_chr_dodge_rating 2, 0x14
set_chr_field0x360 0 set_unarmeddodgerating 0
set_accuracy 10 set_accuracy 10
set_reaction_speed 0 set_reaction_speed 0
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3212,8 +3212,8 @@ func1012_trigger_x_music:
endfunction endfunction
.macro init_guard accuracy health .macro init_guard accuracy health
set_chr_field_0x35e_0x35f 2, 0x14 set_chr_dodge_rating 2, 0x14
set_chr_field0x360 0 set_unarmeddodgerating 0
set_accuracy \accuracy set_accuracy \accuracy
set_reaction_speed 0 set_reaction_speed 0
set_chr_health CHR_SELF, \health set_chr_health CHR_SELF, \health

10
asm/setup/setupark.s
View File

@ -763,7 +763,7 @@ func0410_init_top_guard:
if_difficulty_lt DIFF_SA, /*goto*/ 0x20 if_difficulty_lt DIFF_SA, /*goto*/ 0x20
// SA and PA // SA and PA
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 80 set_accuracy 80
set_reaction_speed 10 set_reaction_speed 10
set_chr_health CHR_SELF, 10 set_chr_health CHR_SELF, 10
@ -774,7 +774,7 @@ func0410_init_top_guard:
// Agent // Agent
label 0x20 label 0x20
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 10 set_reaction_speed 10
set_chr_health CHR_SELF, 10 set_chr_health CHR_SELF, 10
@ -2565,7 +2565,7 @@ func0412_outro:
endfunction endfunction
func0413_defend_pad: func0413_defend_pad:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 10 set_reaction_speed 10
set_chr_health CHR_SELF, 10 set_chr_health CHR_SELF, 10
@ -2622,7 +2622,7 @@ func1001_objectives_failed_msg:
endfunction endfunction
func0414_init_shock: func0414_init_shock:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 10 set_reaction_speed 10
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2636,7 +2636,7 @@ func0414_init_shock:
* @unused * @unused
*/ */
func0415_init_10hp: func0415_init_10hp:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 10 set_reaction_speed 10
set_chr_health CHR_SELF, 10 set_chr_health CHR_SELF, 10

8
asm/setup/setupazt.s
View File

@ -732,7 +732,7 @@ func0407_init_blonde:
endfunction endfunction
func0406_init_stripes: func0406_init_stripes:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 16 set_accuracy 16
set_reaction_speed 55 set_reaction_speed 55
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -791,7 +791,7 @@ func1006_msg_elvisbeable:
endfunction endfunction
.macro init_path pathid function .macro init_path pathid function
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 16 set_accuracy 16
set_reaction_speed 55 set_reaction_speed 55
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -883,7 +883,7 @@ unregistered_function1:
endfunction endfunction
func0415_unused: func0415_unused:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 16 set_accuracy 16
set_reaction_speed 55 set_reaction_speed 55
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -965,7 +965,7 @@ func100c_spawn_dd_guards:
endfunction endfunction
func0416_spawned_guard: func0416_spawned_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 16 set_accuracy 16
set_reaction_speed 55 set_reaction_speed 55
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60

16
asm/setup/setupcave.s
View File

@ -1057,7 +1057,7 @@ func1004_guard_activation:
endfunction endfunction
func0405_start_path15: func0405_start_path15:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2323,7 +2323,7 @@ func100e_check_alaskans_killed:
* @unused * @unused
*/ */
func0410_unused: func0410_unused:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 22 set_accuracy 22
set_reaction_speed 80 set_reaction_speed 80
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2510,7 +2510,7 @@ func040f_nsa:
func0412_init_takeover_lackey: func0412_init_takeover_lackey:
set_onshot_function GFUNC_ALERTED set_onshot_function GFUNC_ALERTED
set_self_flag_bank3 CHRFLAG3_00000040 set_self_flag_bank3 CHRFLAG3_00000040
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 60 set_accuracy 60
set_reaction_speed 80 set_reaction_speed 80
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2795,7 +2795,7 @@ func1017_laser5:
endfunction endfunction
func0403_unused: func0403_unused:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 45 set_reaction_speed 45
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -2948,7 +2948,7 @@ func1016_console_noises:
endfunction endfunction
func0426_init_alaskan_guard: func0426_init_alaskan_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2965,7 +2965,7 @@ func0427_init_posttakeover_guard:
set_self_flag_bank3 CHRFLAG3_00040000 set_self_flag_bank3 CHRFLAG3_00040000
set_self_flag_bank3 CHRFLAG3_HIDDEN set_self_flag_bank3 CHRFLAG3_HIDDEN
set_chr_alliance CHR_SELF, 0x04 set_chr_alliance CHR_SELF, 0x04
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 45 set_reaction_speed 45
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -3015,7 +3015,7 @@ func0428_posttakeover_guard:
* @unused * @unused
*/ */
func0429_unused: func0429_unused:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 22 set_accuracy 22
set_reaction_speed 80 set_reaction_speed 80
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3029,7 +3029,7 @@ func0429_unused:
* Assigned to two stripes guards in the foyer during takeover. * Assigned to two stripes guards in the foyer during takeover.
*/ */
func042a_foyer_spawner: func042a_foyer_spawner:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 12 set_accuracy 12
set_reaction_speed 45 set_reaction_speed 45
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60

6
asm/setup/setupdam.s
View File

@ -637,7 +637,7 @@ func1400_setup_counterop:
func0408_guard_unalerted: func0408_guard_unalerted:
set_chr_cloaked CHR_SELF, FALSE, TRUE set_chr_cloaked CHR_SELF, FALSE, TRUE
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 18 set_accuracy 18
set_reaction_speed 60 set_reaction_speed 60
set_chr_health CHR_SELF, 70 set_chr_health CHR_SELF, 70
@ -1248,7 +1248,7 @@ func100f_check_researchdata_collected:
endfunction endfunction
.macro init_path pathid .macro init_path pathid
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 18 set_accuracy 18
set_reaction_speed 60 set_reaction_speed 60
set_chr_health CHR_SELF, 70 set_chr_health CHR_SELF, 70
@ -2086,7 +2086,7 @@ func1014_moonpool_switch:
func0413_guard_alerted: func0413_guard_alerted:
set_chr_cloaked CHR_SELF, FALSE, TRUE set_chr_cloaked CHR_SELF, FALSE, TRUE
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 18 set_accuracy 18
set_reaction_speed 60 set_reaction_speed 60
set_chr_health CHR_SELF, 70 set_chr_health CHR_SELF, 70

14
asm/setup/setupdepo.s
View File

@ -456,7 +456,7 @@ path03:
endpath endpath
func0409_start_path00: func0409_start_path00:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 5 set_accuracy 5
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -469,7 +469,7 @@ func0409_start_path00:
endfunction endfunction
func040a_start_path01: func040a_start_path01:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 5 set_accuracy 5
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -482,7 +482,7 @@ func040a_start_path01:
endfunction endfunction
func040b_start_path02: func040b_start_path02:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 5 set_accuracy 5
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -495,7 +495,7 @@ func040b_start_path02:
endfunction endfunction
func040c_start_path03: func040c_start_path03:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 5 set_accuracy 5
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1011,7 +1011,7 @@ func1009_spawner_during_decode:
.macro init_swat .macro init_swat
set_chr_flag_bank2 CHR_SELF, CHRFLAG2_00400000 set_chr_flag_bank2 CHR_SELF, CHRFLAG2_00400000
set_self_flag_bankx CHRFLAG1_00080000, BANK_1 set_self_flag_bankx CHRFLAG1_00080000, BANK_1
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 15 set_accuracy 15
set_reaction_speed 25 set_reaction_speed 25
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2292,7 +2292,7 @@ func0414_init_cloak2_guard:
stop_chr stop_chr
set_onshot_function FUNC_CLOAK_GUARD set_onshot_function FUNC_CLOAK_GUARD
set_self_flag_bank3 CHRFLAG3_INVINCIBLE_TO_GUNFIRE set_self_flag_bank3 CHRFLAG3_INVINCIBLE_TO_GUNFIRE
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 5 set_accuracy 5
set_reaction_speed 25 set_reaction_speed 25
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2495,7 +2495,7 @@ func101d_init_mines:
endfunction endfunction
.macro init_guard accuracy reaction function .macro init_guard accuracy reaction function
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy \accuracy set_accuracy \accuracy
set_reaction_speed \reaction set_reaction_speed \reaction
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40

6
asm/setup/setupear.s
View File

@ -791,7 +791,7 @@ path13:
endpath endpath
.macro init_path pathid .macro init_path pathid
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 1 set_accuracy 1
set_reaction_speed 20 set_reaction_speed 20
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2931,7 +2931,7 @@ func1016_setup_drcaroll:
endfunction endfunction
func040a_init_basic_guard: func040a_init_basic_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 1 set_accuracy 1
set_reaction_speed 20 set_reaction_speed 20
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2942,7 +2942,7 @@ func040a_init_basic_guard:
endfunction endfunction
func040b_init_shock_guard: func040b_init_shock_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 11 set_accuracy 11
set_reaction_speed 20 set_reaction_speed 20
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40

2
asm/setup/setupeld.s
View File

@ -2435,7 +2435,7 @@ func1015_check_computers_destroyed:
endfunction endfunction
.macro init_guard accuracy reaction health recovery .macro init_guard accuracy reaction health recovery
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy \accuracy set_accuracy \accuracy
set_reaction_speed \reaction set_reaction_speed \reaction
set_chr_health CHR_SELF, \health set_chr_health CHR_SELF, \health

12
asm/setup/setupimp.s
View File

@ -589,7 +589,7 @@ func1400_setup_counterop:
.endm .endm
.macro initclone_logic templatechr clonefunc .macro initclone_logic templatechr clonefunc
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 20 set_accuracy 20
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1869,7 +1869,7 @@ func0422_taker_holo3:
endfunction endfunction
func0423_init_shock: func0423_init_shock:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 20 set_accuracy 20
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2906,7 +2906,7 @@ func1015_firingrange_pc:
.endm .endm
.macro inittopclone_logic templatechr clonefunc .macro inittopclone_logic templatechr clonefunc
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 20 set_accuracy 20
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3247,7 +3247,7 @@ unregistered_function1:
endfunction endfunction
func043b_init_blonde: func043b_init_blonde:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 20 set_accuracy 20
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3259,7 +3259,7 @@ func043b_init_blonde:
endfunction endfunction
func043c_init_cisolder: func043c_init_cisolder:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 20 set_accuracy 20
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3270,7 +3270,7 @@ func043c_init_cisolder:
endfunction endfunction
func043d_unused: func043d_unused:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 30 set_accuracy 30
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40

16
asm/setup/setuplip.s
View File

@ -1115,7 +1115,7 @@ func1006_check_lab_accessed:
endfunction endfunction
.macro init_path accuracy health recovery pathid .macro init_path accuracy health recovery pathid
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy \accuracy set_accuracy \accuracy
set_reaction_speed 35 set_reaction_speed 35
set_chr_health CHR_SELF, \health set_chr_health CHR_SELF, \health
@ -2450,7 +2450,7 @@ func041d_unused_041d:
* @unused * @unused
*/ */
func041e_unused_041e: func041e_unused_041e:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 35 set_reaction_speed 35
set_chr_health CHR_SELF, 80 set_chr_health CHR_SELF, 80
@ -2798,7 +2798,7 @@ func0420_labtech_doors:
if_shot_near_chr 0x00, /*goto*/ 0x89 if_shot_near_chr 0x00, /*goto*/ 0x89
if_saw_death 0x00, /*goto*/ 0x89 if_saw_death 0x00, /*goto*/ 0x89
dprint "TALK 5\n" dprint "TALK 5\n"
if_chr_field0x332_zero CHR_SELF, /*goto*/ 0x2d if_chr_propsoundcount_zero CHR_SELF, /*goto*/ 0x2d
endloop 0x7b endloop 0x7b
label 0x2d label 0x2d
@ -3757,7 +3757,7 @@ func1025_toggle_guards:
endfunction endfunction
func0429_spawn_while_xraying: func0429_spawn_while_xraying:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 8 set_accuracy 8
set_reaction_speed 35 set_reaction_speed 35
set_chr_health CHR_SELF, 50 set_chr_health CHR_SELF, 50
@ -3835,7 +3835,7 @@ func042b_xray_clone:
endfunction endfunction
func042c_dragon_guard: func042c_dragon_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 8 set_accuracy 8
set_reaction_speed 35 set_reaction_speed 35
set_chr_health CHR_SELF, 50 set_chr_health CHR_SELF, 50
@ -3846,7 +3846,7 @@ func042c_dragon_guard:
endfunction endfunction
func042d_superdragon_guard: func042d_superdragon_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 35 set_reaction_speed 35
set_chr_health CHR_SELF, 80 set_chr_health CHR_SELF, 80
@ -3857,7 +3857,7 @@ func042d_superdragon_guard:
endfunction endfunction
func042e_biotech_guard: func042e_biotech_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 18 set_accuracy 18
set_reaction_speed 35 set_reaction_speed 35
set_chr_health CHR_SELF, 80 set_chr_health CHR_SELF, 80
@ -3868,7 +3868,7 @@ func042e_biotech_guard:
endfunction endfunction
func042e_biotech_guard_alerted: func042e_biotech_guard_alerted:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 18 set_accuracy 18
set_reaction_speed 35 set_reaction_speed 35
set_chr_health CHR_SELF, 80 set_chr_health CHR_SELF, 80

16
asm/setup/setuplue.s
View File

@ -790,7 +790,7 @@ func0426_8420:
endfunction endfunction
.macro init_path pathid .macro init_path pathid
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 6 set_accuracy 6
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1283,7 +1283,7 @@ func100b_final_hangar:
endfunction endfunction
func0411_init_hangar_guard1: func0411_init_hangar_guard1:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 8 set_accuracy 8
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1304,7 +1304,7 @@ func0411_init_hangar_guard1:
endfunction endfunction
func0412_init_hangar_guard2: func0412_init_hangar_guard2:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 8 set_accuracy 8
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1325,7 +1325,7 @@ func0412_init_hangar_guard2:
endfunction endfunction
func0413_init_hangar_guard3: func0413_init_hangar_guard3:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 8 set_accuracy 8
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1346,7 +1346,7 @@ func0413_init_hangar_guard3:
endfunction endfunction
func0414_init_hangar_guard4: func0414_init_hangar_guard4:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 8 set_accuracy 8
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2506,7 +2506,7 @@ func1018_unhide_guards:
endfunction endfunction
func0419_clone_spawner: func0419_clone_spawner:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 8 set_accuracy 8
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2659,12 +2659,12 @@ func040f_spawned_guard:
.endm .endm
func041d_trooper_unalerted: func041d_trooper_unalerted:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
init_guard 6, 50, 0, 0, GFUNC_UNALERTED init_guard 6, 50, 0, 0, GFUNC_UNALERTED
endfunction endfunction
func041f_trooper_alerted: func041f_trooper_alerted:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
init_guard 6, 50, 0, 0, GFUNC_ALERTED init_guard 6, 50, 0, 0, GFUNC_ALERTED
endfunction endfunction

8
asm/setup/setuppam.s
View File

@ -2135,7 +2135,7 @@ func1002_intro:
endfunction endfunction
func042f_init_pelagic_guard: func042f_init_pelagic_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 20 set_accuracy 20
set_reaction_speed 65 set_reaction_speed 65
set_chr_health CHR_SELF, 70 set_chr_health CHR_SELF, 70
@ -2214,7 +2214,7 @@ func1008_msg_theresdrcaroll:
goto_next 0x0d goto_next 0x0d
label 0x2e label 0x2e
if_chr_field0x332_zero CHR_ELVIS, /*goto*/ 0x2e if_chr_propsoundcount_zero CHR_ELVIS, /*goto*/ 0x2e
endloop 0x04 endloop 0x04
label 0x2e label 0x2e
@ -3954,7 +3954,7 @@ func1021_c6c4:
endfunction endfunction
.macro init_path pathid function .macro init_path pathid function
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 20 set_accuracy 20
set_reaction_speed 65 set_reaction_speed 65
set_chr_health CHR_SELF, 70 set_chr_health CHR_SELF, 70
@ -4246,7 +4246,7 @@ func1028_enable_last_3_guards:
endfunction endfunction
func042b_run_to_exit: func042b_run_to_exit:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 40 set_accuracy 40
set_reaction_speed 65 set_reaction_speed 65
set_chr_health CHR_SELF, 10 set_chr_health CHR_SELF, 10

18
asm/setup/setuppete.s
View File

@ -1668,7 +1668,7 @@ func0413_bugspotter:
endfunction endfunction
.macro init_patroller pathid .macro init_patroller pathid
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 4 set_accuracy 4
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1813,7 +1813,7 @@ func041d_fbi:
beginloop 0x0e beginloop 0x0e
if_difficulty_lt DIFF_SA, /*goto*/ 0x03 if_difficulty_lt DIFF_SA, /*goto*/ 0x03
if_chr_field0x332_zero CHR_SELF, /*goto*/ 0x04 if_chr_propsoundcount_zero CHR_SELF, /*goto*/ 0x04
label 0x03 label 0x03
if_chr_stopped /*goto*/ 0x04 if_chr_stopped /*goto*/ 0x04
endloop 0x0e endloop 0x0e
@ -2010,7 +2010,7 @@ func041a_robot:
func041e_sealer1: func041e_sealer1:
.set LABEL_ALERTED, 0x18 .set LABEL_ALERTED, 0x18
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 4 set_accuracy 4
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2278,7 +2278,7 @@ func100d_spawn_alarm_responders:
func041f_alarm_responder: func041f_alarm_responder:
set_self_flag_bankx CHRFLAG1_00080000, BANK_1 set_self_flag_bankx CHRFLAG1_00080000, BANK_1
set_self_flag_bankx CHRFLAG0_80000000, BANK_0 set_self_flag_bankx CHRFLAG0_80000000, BANK_0
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 14 set_accuracy 14
set_reaction_speed 20 set_reaction_speed 20
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2791,7 +2791,7 @@ func1019_setup_topstairs_death_animation:
endfunction endfunction
func040e_6064: func040e_6064:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 4 set_accuracy 4
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2803,7 +2803,7 @@ func040e_6064:
func040f_6088: func040f_6088:
if_difficulty_lt DIFF_SA, /*goto*/ 0x03 if_difficulty_lt DIFF_SA, /*goto*/ 0x03
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 20 set_accuracy 20
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2812,7 +2812,7 @@ func040f_6088:
set_shield 0 set_shield 0
set_function CHR_SELF, GFUNC_UNALERTED set_function CHR_SELF, GFUNC_UNALERTED
label 0x03 label 0x03
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 4 set_accuracy 4
set_reaction_speed 30 set_reaction_speed 30
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2823,7 +2823,7 @@ func040f_6088:
endfunction endfunction
func0410_60d0: func0410_60d0:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 14 set_accuracy 14
set_reaction_speed 20 set_reaction_speed 20
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2835,7 +2835,7 @@ func0410_60d0:
func0411_60f4: func0411_60f4:
set_self_flag_bank3 CHRFLAG3_00020000 set_self_flag_bank3 CHRFLAG3_00020000
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 14 set_accuracy 14
set_reaction_speed 20 set_reaction_speed 20
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40

22
asm/setup/setuprit.s
View File

@ -1625,7 +1625,7 @@ func100c_cockpit_stripes:
set_chr_alliance CHR_SELF, 0x04 set_chr_alliance CHR_SELF, 0x04
cmd0145_rebuild_groups cmd0145_rebuild_groups
cmd0146_rebuild_groups cmd0146_rebuild_groups
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -1663,7 +1663,7 @@ func0413_taker1:
cmd0145_rebuild_groups cmd0145_rebuild_groups
cmd0146_rebuild_groups cmd0146_rebuild_groups
set_self_flag_bank3 CHRFLAG3_00000020 set_self_flag_bank3 CHRFLAG3_00000020
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
set_armor 0 set_armor 0
@ -1678,7 +1678,7 @@ func0413_taker2:
cmd0145_rebuild_groups cmd0145_rebuild_groups
cmd0146_rebuild_groups cmd0146_rebuild_groups
set_self_flag_bank3 CHRFLAG3_00000020 set_self_flag_bank3 CHRFLAG3_00000020
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
set_armor 0 set_armor 0
@ -1924,7 +1924,7 @@ func0412_sitting_guy:
endfunction endfunction
func0426_start_path00: func0426_start_path00:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1937,7 +1937,7 @@ func0426_start_path00:
endfunction endfunction
func0427_start_path01: func0427_start_path01:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -2420,7 +2420,7 @@ func0415_cloner1:
endfunction endfunction
func0416_init_clone1: func0416_init_clone1:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -2513,7 +2513,7 @@ func0418_cloner2:
endfunction endfunction
func0419_init_clone2: func0419_init_clone2:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -2602,7 +2602,7 @@ func041b_cloner3:
endfunction endfunction
func041c_init_clone3: func041c_init_clone3:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -2632,7 +2632,7 @@ func041f_init_blonde:
set_chr_alliance CHR_SELF, 0x04 set_chr_alliance CHR_SELF, 0x04
cmd0145_rebuild_groups cmd0145_rebuild_groups
cmd0146_rebuild_groups cmd0146_rebuild_groups
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 24 set_accuracy 24
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60
@ -3019,7 +3019,7 @@ func042a_init_neutral:
yield yield
yield yield
yield yield
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 70 set_reaction_speed 70
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3032,7 +3032,7 @@ func042a_init_neutral:
endfunction endfunction
func042b_reinit_stripes: func042b_reinit_stripes:
set_chr_field_0x35e_0x35f 2, 0x00 set_chr_dodge_rating 2, 0x00
set_accuracy 14 set_accuracy 14
set_reaction_speed 50 set_reaction_speed 50
set_chr_health CHR_SELF, 60 set_chr_health CHR_SELF, 60

4
asm/setup/setupsho.s
View File

@ -563,7 +563,7 @@ func0402_unarmed_skedar:
label 0x09 label 0x09
label 0x0a label 0x0a
if_chr_field0x332_zero CHR_SELF, /*goto*/ 0x2d if_chr_propsoundcount_zero CHR_SELF, /*goto*/ 0x2d
goto_next 0x2d goto_next 0x2d
label 0x06 label 0x06
@ -755,7 +755,7 @@ func0404_miniskedar:
restart_timer restart_timer
label 0x09 label 0x09
restart_timer restart_timer
if_chr_field0x332_zero CHR_SELF, /*goto*/ 0x2d if_chr_propsoundcount_zero CHR_SELF, /*goto*/ 0x2d
goto_next 0x06 goto_next 0x06
label 0x2d label 0x2d

14
asm/setup/setuptra.s
View File

@ -1511,7 +1511,7 @@ func1008_spawngroup1:
endfunction endfunction
func1008_spawngroup1_guard: func1008_spawngroup1_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 40 set_reaction_speed 40
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1584,7 +1584,7 @@ func1013_spawngroup2:
endfunction endfunction
func1013_spawngroup2_guard: func1013_spawngroup2_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 40 set_reaction_speed 40
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1685,7 +1685,7 @@ func1014_spawngroup3:
endfunction endfunction
func1014_spawngroup3_guard: func1014_spawngroup3_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 40 set_reaction_speed 40
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -1765,7 +1765,7 @@ func1015_spawngroup4:
* @unused * @unused
*/ */
func1015_spawngroup4_guard: func1015_spawngroup4_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 40 set_reaction_speed 40
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3124,7 +3124,7 @@ func1021_jo_escaping:
* time. * time.
*/ */
func0416_spawn_during_follow: func0416_spawn_during_follow:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 40 set_reaction_speed 40
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3192,7 +3192,7 @@ func0418_follower_clone:
endfunction endfunction
func0419_init_biotech: func0419_init_biotech:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 20 set_accuracy 20
set_reaction_speed 40 set_reaction_speed 40
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40
@ -3204,7 +3204,7 @@ func0419_init_biotech:
endfunction endfunction
func041a_init_superdragon_guard: func041a_init_superdragon_guard:
set_chr_field_0x35e_0x35f 2, 0x0a set_chr_dodge_rating 2, 0x0a
set_accuracy 10 set_accuracy 10
set_reaction_speed 40 set_reaction_speed 40
set_chr_health CHR_SELF, 40 set_chr_health CHR_SELF, 40