From e5192213f344064a8a088e8ff8af9150ff6ff87f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 2 Nov 2019 17:16:17 +1000 Subject: [PATCH] Decompile chrRestartTimer --- src/game/chr/chraicommands.c | 2 +- src/game/game_000000.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 0483530d8..9a09ab0fe 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -6182,7 +6182,7 @@ bool ai0091(void) bool aiRestartTimer(void) { if (g_Vars.chrdata) { - func0f049f94(g_Vars.chrdata); + chrRestartTimer(g_Vars.chrdata); } else if (g_Vars.aiddata) { func0f07b0f4(g_Vars.aiddata); } diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 74e0b2f5c..77a720c05 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -84699,14 +84699,11 @@ bool chrHasHiddenFlag00000002(struct chrdata *chr) return (chr->hidden & 0x00000002) != 0; } -GLOBAL_ASM( -glabel func0f049f94 -/* f049f94: 8c8e0014 */ lw $t6,0x14($a0) -/* f049f98: ac80011c */ sw $zero,0x11c($a0) -/* f049f9c: 35cf0040 */ ori $t7,$t6,0x40 -/* f049fa0: 03e00008 */ jr $ra -/* f049fa4: ac8f0014 */ sw $t7,0x14($a0) -); +void chrRestartTimer(struct chrdata *chr) +{ + chr->timer60 = 0; + chr->hidden |= CHRFLAG2_TIMER_RUNNING; +} GLOBAL_ASM( glabel chrGetTimer