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

Rename field_0x17e to target

This commit is contained in:
Ryan Dwyer 2019-09-23 22:23:31 +10:00
parent 30e98a1629
commit c034f62448
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/globals.c
View File

@ -32658,7 +32658,7 @@ u8 func000c_combat_with_target_chr[] = {
goto_next(0x16)
label(0x13)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0xb3)
if_target_chrs_target_is_different(/*goto*/ 0xb3)
label(0x16)
dprint 'N','O',' ','T','A','R','G','E','T','\n',0,
set_target_chr(-1)
@ -32714,7 +32714,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xba)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xba)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xba)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0x16)
// Target's field 0x17e is different
@ -32744,7 +32744,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xba)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xba)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xba)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0xba)
label(0x13)
@ -32780,7 +32780,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xba)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xba)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xba)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0xba)
label(0x13)
@ -32795,7 +32795,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xc0)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xc0)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xc0)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0xc0)
label(0x13)
@ -32817,7 +32817,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xc1)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xc1)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xc1)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0xc1)
label(0x13)
@ -32913,7 +32913,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xc1)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xc1)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xc1)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x16)
if_target_chrs_target_is_different(/*goto*/ 0x16)
goto_next(0xc1)
label(0x16)
@ -32955,7 +32955,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xc5)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xc5)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xc5)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0xc5)
label(0x13)
@ -33006,7 +33006,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xc5)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xc5)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xc5)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0xc5)
label(0x13)
@ -33048,7 +33048,7 @@ u8 func000c_combat_with_target_chr[] = {
if_chr_dying(TARGET_CHR, /*goto*/ 0xc5)
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0xc5)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0xc5)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
goto_next(0xc5)
label(0x13)
@ -33483,7 +33483,7 @@ u8 func000f_hand_combat[] = {
// This if-statement is effectively a no op
dprint 'L','1','\n',0,
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x13)
if_target_chrs_target_is_different(/*goto*/ 0x13)
dprint 'L','2','\n',0,
label(0x13)
@ -33935,7 +33935,7 @@ u8 func001b_observe_camspy[] = {
// Unreachable - no label
dprint 'E','4','\n',0,
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x16)
if_target_chrs_target_is_different(/*goto*/ 0x16)
dprint 'E','5','\n',0,
goto_next(0x13)

3
src/include/commands.h
View File

@ -991,7 +991,7 @@
0x00, \
0x00,
#define if_target_chrs_field_0x17e_is_different(label) \
#define if_target_chrs_target_is_different(label) \
mkshort(0x0107), \
label,
@ -1470,7 +1470,6 @@
0x00, \
label,
// Related to chr fields 0x17e and 0x32e
// In practice, scripts will assign function unalerted guard if this passes
#define if_chr_lost_track_of_target_maybe(label) \
mkshort(0x0183), \

2
src/setup/setuplee.c
View File

@ -875,7 +875,7 @@ u8 func0409_elvis_follow[] = {
if_chr_death_animation_finished(TARGET_CHR, /*goto*/ 0x2c)
if_chr_dying(TARGET_CHR, /*goto*/ 0x2c)
if_chr_unloaded(TARGET_CHR, /*goto*/ 0x2c)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x06)
if_target_chrs_target_is_different(/*goto*/ 0x06)
label(0x2c)
goto_first(0x03)

2
src/setup/setuprit.c
View File

@ -1780,7 +1780,7 @@ u8 func0413_taker[] = {
label(0x2d)
if_chr_lost_track_of_target_maybe(/*goto*/ 0x11)
if_target_chrs_field_0x17e_is_different(/*goto*/ 0x2d)
if_target_chrs_target_is_different(/*goto*/ 0x2d)
goto_next(0x11)
label(0x2d)