From 8a839952d39e834e10259cf2ab05830fe73491ef Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 19 Oct 2019 13:37:28 +1000 Subject: [PATCH] Decompile aiSetMorale --- src/game/chr/chraicommands.c | 24 ++++++++---------------- src/include/game/chr/chraicommands.h | 2 +- src/setup/setup_000000.c | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 71be5f1bd..2a06fd418 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5075,22 +5075,14 @@ bool aiIfStageIdGreaterThan(void) /** * @cmd 0084 */ -GLOBAL_ASM( -glabel ai0084 -/* f053304: 3c04800a */ lui $a0,0x800a -/* f053308: 24849fc0 */ addiu $a0,$a0,-24640 -/* f05330c: 8c8e0434 */ lw $t6,0x434($a0) -/* f053310: 8c8f0438 */ lw $t7,0x438($a0) -/* f053314: 8c990424 */ lw $t9,0x424($a0) -/* f053318: 00001025 */ or $v0,$zero,$zero -/* f05331c: 01cf1821 */ addu $v1,$t6,$t7 -/* f053320: 90780002 */ lbu $t8,0x2($v1) -/* f053324: a3380112 */ sb $t8,0x112($t9) -/* f053328: 8c880438 */ lw $t0,0x438($a0) -/* f05332c: 25090003 */ addiu $t1,$t0,0x3 -/* f053330: 03e00008 */ jr $ra -/* f053334: ac890438 */ sw $t1,0x438($a0) -); +bool aiSetMorale(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + g_Vars.chrdata->morale = cmd[2]; + g_Vars.aioffset += 3; + + return false; +} /** * @cmd 0085 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index d059183f1..4f660f685 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -134,7 +134,7 @@ /*0x0081*/ bool ai0081(void); /*0x0082*/ bool ai0082(void); /*0x0083*/ bool ai0083(void); -/*0x0084*/ bool ai0084(void); +/*0x0084*/ bool aiSetMorale(void); /*0x0085*/ bool ai0085(void); /*0x0086*/ bool ai0086(void); /*0x0087*/ bool ai0087(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 2d8c21cbe..c82d21650 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14085,7 +14085,7 @@ bool (*command_pointers[])(void) = { /*0x0081*/ ai0081, /*0x0082*/ ai0082, /*0x0083*/ ai0083, - /*0x0084*/ ai0084, + /*0x0084*/ aiSetMorale, /*0x0085*/ ai0085, /*0x0086*/ ai0086, /*0x0087*/ ai0087,