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

Fix unintended replacements from when animation was renamed to chr_do_animation

This commit is contained in:
Ryan Dwyer 2020-02-02 23:45:05 +10:00
parent b12c48d620
commit d0160628bf
16 changed files with 509 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1018,7 +1018,7 @@ s32 path29[] = {
* @unused
*/
u8 func0401_do_some_animation[] = {
// Do some chr_do_animation
// Do some animation
restart_timer
chr_do_animation(0x0066, 0, 1, 0x04, 0x10, CHR_SELF, 2)

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

@ -1877,7 +1877,7 @@ u8 func040a_tech2[] = {
// @bug: Duplicate label. I suspect the goto first 0x21 below is
// supposed to go here. The only possible side effect is the tech may
// restart his chr_do_animation repeatedly.
// restart his animation repeatedly.
label(0x21)
yield
if_sound_finished(CHANNEL_7, /*goto*/ 0x20)

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

@ -1171,7 +1171,7 @@ u8 func0404_elvis[] = {
call_rng
if_rand_gt(128, /*goto*/ 0x31)
// 50% chance of doing look around chr_do_animation
// 50% chance of doing look around animation
call_rng
if_rand_lt(64, /*goto*/ 0x99)
if_rand_lt(128, /*goto*/ 0x9a)

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

@ -2485,7 +2485,7 @@ u8 func0415_elvis_at_start[] = {
call_rng
if_rand_gt(128, /*goto*/ 0x07)
// 50% chance of doing an idle chr_do_animation
// 50% chance of doing an idle animation
call_rng
if_rand_lt(64, /*goto*/ 0x44)
if_rand_lt(128, /*goto*/ 0x45)

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

@ -578,7 +578,7 @@ u8 func041e_colleague[] = {
chr_do_animation(0x0227, 0, -1, 0x14, 0x00, CHR_SELF, 2)
reloop(0x04)
// Player not in sight - 2 in 255 chance of doing a bored chr_do_animation
// Player not in sight - 2 in 255 chance of doing a bored animation
label(0x7f)
call_rng
if_rand_gt(1, /*goto*/ 0x06)

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

@ -1838,7 +1838,7 @@ u8 func0404_sniper[] = {
label(0x10)
// 4 in 255 chance of looking around,
// and the chr_do_animation used is random too.
// and the animation used is random too.
call_rng
if_rand_gt(3, /*goto*/ 0x0b)
call_rng

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

@ -872,11 +872,11 @@ u8 func0c01_outro[] = {
set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000)
chr_do_animation(0x01a3, -1, -1, 0x06, 0x00, CHR_P1P2, 4)
#define show_object_with_animation(object, chr_do_animation) \
#define show_object_with_animation(object, animation) \
show_object(object) \
set_object_flag2(object, OBJFLAG2_04000000) \
set_object_flag3(object, OBJFLAG3_00000010) \
object_do_animation(chr_do_animation, object, 0x04ff, 0xff)
object_do_animation(animation, object, 0x04ff, 0xff)

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

@ -41,7 +41,7 @@ struct path paths[] = {
/**
* Some kind of camera movement test? When you press a button it jumps forward
* to the next camera chr_do_animation rather than ending the cutscene.
* to the next camera animation rather than ending the cutscene.
*/
u8 func0c00_017c[] = {
set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN)

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

@ -478,11 +478,11 @@ s32 path13[] = {
-1,
};
#define chicago_car_do_animation(object, chr_do_animation) \
#define chicago_car_do_animation(object, animation) \
show_object(object) \
set_object_flag2(object, OBJFLAG2_04000000) \
set_object_flag3(object, OBJFLAG3_00000010) \
object_do_animation(chr_do_animation, object, 0x04ff, 0xff)
object_do_animation(animation, object, 0x04ff, 0xff)
@ -1639,7 +1639,7 @@ u8 func0413_bugspotter[] = {
set_stage_flag(STAGEFLAG_TRACERBUG_SPOTTED)
message(CHR_BOND, 0x3243) // "Tracer Bug has been spotted."
// Wait for talking chr_do_animation to finish
// Wait for talking animation to finish
beginloop(0x05)
if_stage_flag_eq(STAGEFLAG_LIMO_READY_TO_LEAVE, TRUE, /*goto*/ LABEL_RUN_AWAY)
if_stage_flag_eq(STAGEFLAG_TAXI_READY_TO_CRASH, TRUE, /*goto*/ LABEL_RUN_AWAY)
@ -1804,7 +1804,7 @@ u8 func041d_fbi[] = {
label(0x03)
if_num_times_shot_lt(1, /*goto*/ 0x19)
// Shot - wait for chr_do_animation to finish
// Shot - wait for animation to finish
beginloop(0x05)
if_chr_stopped(/*goto*/ 0x04)
endloop(0x05)
@ -3069,7 +3069,7 @@ u8 func1020_elevator_doors[] = {
};
/**
* Guard at top stairs: Turn off special death chr_do_animation if he's moved away from
* Guard at top stairs: Turn off special death animation if he's moved away from
* his pad or if Jo has climbed the staircase.
*/
u8 func1021_check_topstairs_guy[] = {

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

@ -1469,7 +1469,7 @@ u8 func0404_president_running[] = {
if_chr_stopped(/*goto*/ 0x55)
endloop(0x56)
// Not injured, or injury chr_do_animation finished
// Not injured, or injury animation finished
label(0x55)
stop_chr
restart_timer

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

@ -3056,7 +3056,7 @@ u8 func1017_msg_skedararmy[] = {
endloop(0x04)
label(0x2d)
speak(CHR_P1P2, 0x4220, 0x73e2, CHANNEL_6, COLOR_09_BLUE) // "OH, NO!!! A Skedar army in suspended chr_do_animation!"
speak(CHR_P1P2, 0x4220, 0x73e2, CHANNEL_6, COLOR_09_BLUE) // "OH, NO!!! A Skedar army in suspended animation!"
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};

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

@ -1350,7 +1350,7 @@ u8 func0411_cass_in_office[] = {
label(0x2c)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0x82)
// Wait until shooting chr_do_animation finished
// Wait until shooting animation finished
beginloop(0x82)
if_chr_stopped(/*goto*/ 0x06)
endloop(0x82)
@ -1380,7 +1380,7 @@ u8 func0413_cass_running[] = {
if_just_injured(CHR_SELF, /*goto*/ 0xb5)
goto_next(0xb1)
// Shot/hurt - wait until chr_do_animation finished
// Shot/hurt - wait until animation finished
beginloop(0xb5)
if_chr_stopped(/*goto*/ 0xb1)
endloop(0xb5)
@ -2120,7 +2120,7 @@ u8 func1011_shuttle_animation[] = {
label(0x09)
restart_timer
// Some kind of chr_do_animation on repeat
// Some kind of animation on repeat
beginloop(0x08)
object_do_animation(0x0489, OBJ_SHUTTLE1, 0x08ff, -1)
endloop(0x08)

22
src/game/data/ailists.c
View File

@ -111,8 +111,8 @@ u8 func0006_unalerted[] = {
label(0x14)
set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_04000000)
// Stop chr, either immediately or by waiting for their chr_do_animation to end.
// I think the chr_do_animation is their injured chr_do_animation.
// Stop chr, either immediately or by waiting for their animation to end.
// I think the animation is their injured animation.
label(0x13)
set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_02000000)
if_chr_idle(/*goto*/ 0x13)
@ -760,7 +760,7 @@ u8 func0006_unalerted[] = {
label(0x13)
set_ailist(CHR_SELF, GAILIST_WAKEUP)
// Wait until chr finished chr_do_animation, then become alert.
// Wait until chr finished animation, then become alert.
// Used when standing up from sitting.
label(0x0c)
dprint 'G','O','T',' ','W','A','T','\n',0,
@ -789,7 +789,7 @@ u8 func0008_wakeup[] = {
set_returnlist(CHR_SELF, GAILIST_INIT_PSYCHOSIS)
set_ailist(CHR_SELF, GAILIST_INIT_PSYCHOSIS)
// Unset special death chr_do_animation if no longer idle
// Unset special death animation if no longer idle
label(0x16)
if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, FALSE, BANK_1, /*goto*/ 0x13)
set_chr_special_death_animation(CHR_SELF, 0)
@ -828,7 +828,7 @@ u8 func0008_wakeup[] = {
label(0x16)
object_do_animation(0x027b, 0xff, 0x02ff, 0xff)
// Wait for stand up chr_do_animation to finish
// Wait for stand up animation to finish
label(0x0c)
dprint 'G','O','T',' ','W','A','T','\n',0,
yield
@ -861,7 +861,7 @@ u8 func0007_alerted[] = {
set_returnlist(CHR_SELF, GAILIST_INIT_PSYCHOSIS)
set_ailist(CHR_SELF, GAILIST_INIT_PSYCHOSIS)
// If doing idle chr_do_animation, turn off special death chr_do_animation
// If doing idle animation, turn off special death animation
label(0x16)
if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, FALSE, BANK_1, /*goto*/ 0x13)
set_chr_special_death_animation(CHR_SELF, 0)
@ -925,7 +925,7 @@ u8 func0007_alerted[] = {
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 chr_do_animation
// the chr to have finished their injury animation
beginloop(0x1d)
if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x16)
if_num_times_shot_lt(1, /*goto*/ 0x16)
@ -2807,7 +2807,7 @@ u8 func000b_choose_target_chr[] = {
u8 func000d_init_combat[] = {
set_shotlist(GAILIST_COMBAT_WITH_TARGET)
// If not idle, turn off special death chr_do_animation
// If not idle, turn off special death animation
if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, FALSE, BANK_1, /*goto*/ 0x13)
set_chr_special_death_animation(CHR_SELF, 0)
@ -3670,7 +3670,7 @@ u8 func001e_look_around[] = {
chr_do_animation(ANIM_LOOK_AROUND_025D, 0, 183, 0x18, 0x10, CHR_SELF, 2)
goto_next(0x16)
// @bug: Shows grab crotch chr_do_animation when wanting to look around instead.
// @bug: Shows grab crotch animation when wanting to look around instead.
// Probably a copy/paste error from previous function.
label(0x13)
if_rand_gt(200, /*goto*/ 0x13)
@ -4225,7 +4225,7 @@ u8 func001b_observe_camspy[] = {
label(0x16)
try_aim_and_shoot_thing2(0x0200, 0x0000, /*goto*/ 0xc3)
// Wait until shooting chr_do_animation done
// Wait until shooting animation done
beginloop(0xc3)
if_chr_stopped(/*goto*/ 0x16)
endloop(0xc3)
@ -5155,7 +5155,7 @@ u8 func0026_init_psychosis[] = {
yield
chr_do_animation(ANIM_BIG_SNEEZE, -1, -1, 0x10, 0x14, CHR_SELF, 2)
// Wait for chr_do_animation to finish
// Wait for animation to finish
beginloop(0x03)
if_chr_stopped(/*goto*/ 0x16)
endloop(0x03)

950
src/game/data/inventory.c
View File

File diff suppressed because it is too large Load Diff

4
src/include/constants.h
View File

@ -262,7 +262,7 @@
#define CHRFLAG1_00000004 0x00000004 // Globals - If set, avoids cmd0184
#define CHRFLAG1_00000008 0x00000008 // Only used in WAR. If set, chr waits 2 seconds before attacking while defending
#define CHRFLAG1_00000010 0x00000010 // Globals - If set, avoids cmd0184
#define CHRFLAG1_00000020 0x00000020 // Globals, AF1, Defense - related to reload chr_do_animation
#define CHRFLAG1_00000020 0x00000020 // Globals, AF1, Defense - related to reload animation
#define CHRFLAG1_CAN_SNIPE 0x00000040
#define CHRFLAG1_00000080 0x00000080 // Not used in scripts
#define CHRFLAG1_DOINGIDLEANIMATION 0x00000100
@ -332,7 +332,7 @@
#define CHRCFLAG_INVINCIBLE_TO_GUNFIRE 0x00000010
#define CHRCFLAG_00000020 0x00000020 // Chicago, Infiltration, AF1, Ruins, WAR
#define CHRCFLAG_00000040 0x00000040 // Used quite a lot
#define CHRCFLAG_00000080 0x00000080 // Defection programmer, Rescue lab techs, globals when doing idle chr_do_animation
#define CHRCFLAG_00000080 0x00000080 // Defection programmer, Rescue lab techs, globals when doing idle animation
#define CHRCFLAG_JUST_INJURED 0x00000100
#define CHRCFLAG_00000200 0x00000200 // Set on clones
#define CHRCFLAG_HIDDEN 0x00000400

4
src/include/gunscript.h
View File

@ -38,8 +38,8 @@
0x09000000 | unk1, \
0,
#define gunscript_playanimation(chr_do_animation, direction, speed) \
0x0a000000 | chr_do_animation, \
#define gunscript_playanimation(animation, direction, speed) \
0x0a000000 | animation, \
(direction << 16) | speed,
#define gunscript_setsoundspeed(keyframe, speed) \