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

Identify aiIfTimerLessThan, aiIfTimerLessThan and heliGetTimer

This commit is contained in:
Ryan Dwyer 2019-11-28 19:50:33 +10:00
parent 691d7bd353
commit 5107d50e4f
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/chr/chraicommands.c
View File

@ -5470,7 +5470,7 @@ bool aiIfTimerGreaterThanRandom(void)
* @cmd 00bc
*/
GLOBAL_ASM(
glabel ai00bc
glabel aiIfTimerLessThan
/* f05511c: 3c03800a */ lui $v1,%hi(g_Vars)
/* f055120: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars)
/* f055124: 8c6e0434 */ lw $t6,0x434($v1)
@ -5513,7 +5513,7 @@ glabel ai00bc
/* f0551b0: 50800014 */ beqzl $a0,.L0f055204
/* f0551b4: 8c6d0438 */ lw $t5,0x438($v1)
/* f0551b8: afa2001c */ sw $v0,0x1c($sp)
/* f0551bc: 0fc1ec48 */ jal func0f07b120
/* f0551bc: 0fc1ec48 */ jal heliGetTimer
/* f0551c0: e7a20018 */ swc1 $f2,0x18($sp)
/* f0551c4: c7a20018 */ lwc1 $f2,0x18($sp)
/* f0551c8: 3c03800a */ lui $v1,%hi(g_Vars)
@ -5547,7 +5547,7 @@ glabel ai00bc
* @cmd 00bd
*/
GLOBAL_ASM(
glabel ai00bd
glabel aiIfTimerGreaterThan
/* f055220: 27bdffd8 */ addiu $sp,$sp,-40
/* f055224: afb00018 */ sw $s0,0x18($sp)
/* f055228: 3c10800a */ lui $s0,%hi(g_Vars)
@ -5584,7 +5584,7 @@ glabel ai00bd
/* f05529c: 8e040430 */ lw $a0,0x430($s0)
/* f0552a0: 50800005 */ beqzl $a0,.L0f0552b8
/* f0552a4: 8e040424 */ lw $a0,0x424($s0)
/* f0552a8: 0fc1ec48 */ jal func0f07b120
/* f0552a8: 0fc1ec48 */ jal heliGetTimer
/* f0552ac: afa20024 */ sw $v0,0x24($sp)
/* f0552b0: 8fa20024 */ lw $v0,0x24($sp)
/* f0552b4: 8e040424 */ lw $a0,0x424($s0)
@ -5603,7 +5603,7 @@ glabel ai00bd
.L0f0552e4:
/* f0552e4: 50800010 */ beqzl $a0,.L0f055328
/* f0552e8: 8e0d0438 */ lw $t5,0x438($s0)
/* f0552ec: 0fc1ec48 */ jal func0f07b120
/* f0552ec: 0fc1ec48 */ jal heliGetTimer
/* f0552f0: afa20024 */ sw $v0,0x24($sp)
/* f0552f4: c7a40020 */ lwc1 $f4,0x20($sp)
/* f0552f8: 8fa20024 */ lw $v0,0x24($sp)

2
src/game/game_066310.c
View File

@ -24838,7 +24838,7 @@ glabel func0f07b0f4
);
GLOBAL_ASM(
glabel func0f07b120
glabel heliGetTimer
/* f07b120: 27bdffe8 */ addiu $sp,$sp,-24
/* f07b124: afbf0014 */ sw $ra,0x14($sp)
/* f07b128: 0fc1eb7d */ jal func0f07adf4

4
src/include/game/chr/chraicommands.h
View File

@ -190,8 +190,8 @@
/*0x00b9*/ bool aiResumeTimer(void);
/*0x00ba*/ bool aiIfTimerStopped(void);
/*0x00bb*/ bool aiIfTimerGreaterThanRandom(void);
/*0x00bc*/ bool ai00bc(void);
/*0x00bd*/ bool ai00bd(void);
/*0x00bc*/ bool aiIfTimerLessThan(void);
/*0x00bd*/ bool aiIfTimerGreaterThan(void);
/*0x00be*/ bool aiShowCountdownTimer(void);
/*0x00bf*/ bool aiHideCountdownTimer(void);
/*0x00c0*/ bool aiSetCountdownTimerValue(void);

2
src/include/game/game_066310.h
View File

@ -169,7 +169,7 @@ u32 func0f07b038(struct heliobj *heli);
void func0f07b078(struct heliobj *heli);
u32 func0f07b0bc(struct heliobj *heli, u32 arg1);
u32 func0f07b0f4(struct heliobj *heli);
u32 func0f07b120(void);
float heliGetTimer(struct heliobj *heli);
u32 func0f07b158(void);
u32 func0f07b164(void);
u32 func0f07b290(struct heliobj *heli, u32 arg1);

4
src/setup/setup_000000.c
View File

@ -14320,8 +14320,8 @@ bool (*g_CommandPointers[])(void) = {
/*0x00b9*/ aiResumeTimer,
/*0x00ba*/ aiIfTimerStopped,
/*0x00bb*/ aiIfTimerGreaterThanRandom,
/*0x00bc*/ ai00bc,
/*0x00bd*/ ai00bd,
/*0x00bc*/ aiIfTimerLessThan,
/*0x00bd*/ aiIfTimerGreaterThan,
/*0x00be*/ aiShowCountdownTimer,
/*0x00bf*/ aiHideCountdownTimer,
/*0x00c0*/ aiSetCountdownTimerValue,