From be48918c0112beec6efcabb138a78b664afdf53c Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 10 Oct 2019 22:46:47 +1000 Subject: [PATCH] Decompile aiStartCountdownTimer --- src/game/chr/chraicommands.c | 23 +++++++---------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 0708fb364..d00263757 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -8060,22 +8060,13 @@ bool aiStopCountdownTimer(void) /** * @cmd 00c2 */ -GLOBAL_ASM( -glabel ai00c2 -/* f055454: 27bdffe8 */ addiu $sp,$sp,-24 -/* f055458: afbf0014 */ sw $ra,0x14($sp) -/* f05545c: 0fc2421c */ jal countdownTimerSetRunning -/* f055460: 24040001 */ addiu $a0,$zero,0x1 -/* f055464: 3c03800a */ lui $v1,0x800a -/* f055468: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05546c: 8c6e0438 */ lw $t6,0x438($v1) -/* f055470: 8fbf0014 */ lw $ra,0x14($sp) -/* f055474: 27bd0018 */ addiu $sp,$sp,0x18 -/* f055478: 25cf0002 */ addiu $t7,$t6,0x2 -/* f05547c: ac6f0438 */ sw $t7,0x438($v1) -/* f055480: 03e00008 */ jr $ra -/* f055484: 00001025 */ or $v0,$zero,$zero -); +bool aiStartCountdownTimer(void) +{ + countdownTimerSetRunning(true); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 00c3 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index afd91ca5b..ee130d5f6 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -196,7 +196,7 @@ /*0x00bf*/ bool aiHideCountdownTimer(void); /*0x00c0*/ bool ai00c0(void); /*0x00c1*/ bool aiStopCountdownTimer(void); -/*0x00c2*/ bool ai00c2(void); +/*0x00c2*/ bool aiStartCountdownTimer(void); /*0x00c3*/ bool ai00c3(void); /*0x00c4*/ bool ai00c4(void); /*0x00c5*/ bool ai00c5(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 38536500a..d9b3c5102 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14143,7 +14143,7 @@ bool (*command_pointers[])(void) = { /*0x00bf*/ aiHideCountdownTimer, /*0x00c0*/ ai00c0, /*0x00c1*/ aiStopCountdownTimer, - /*0x00c2*/ ai00c2, + /*0x00c2*/ aiStartCountdownTimer, /*0x00c3*/ ai00c3, /*0x00c4*/ ai00c4, /*0x00c5*/ ai00c5,