From d5d35f354f583193c6aef82bfac28804622ee636 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 20 Oct 2019 22:41:33 +1000 Subject: [PATCH] Decompile aiRebuildTeams --- 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 13696d486..a19f7fe10 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -14070,22 +14070,13 @@ bool ai0144(void) /** * @cmd 0145 */ -GLOBAL_ASM( -glabel ai0145 -/* f05be38: 27bdffe8 */ addiu $sp,$sp,-24 -/* f05be3c: afbf0014 */ sw $ra,0x14($sp) -/* f05be40: 0fc13301 */ jal func0f04cc04 -/* f05be44: 00000000 */ sll $zero,$zero,0x0 -/* f05be48: 3c03800a */ lui $v1,0x800a -/* f05be4c: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05be50: 8c6e0438 */ lw $t6,0x438($v1) -/* f05be54: 8fbf0014 */ lw $ra,0x14($sp) -/* f05be58: 27bd0018 */ addiu $sp,$sp,0x18 -/* f05be5c: 25cf0002 */ addiu $t7,$t6,0x2 -/* f05be60: ac6f0438 */ sw $t7,0x438($v1) -/* f05be64: 03e00008 */ jr $ra -/* f05be68: 00001025 */ or $v0,$zero,$zero -); +bool aiRebuildTeams(void) +{ + func0f04cc04(); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 0146 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index b6ef6e556..ca52e4ff5 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -323,7 +323,7 @@ /*0x0142*/ bool ai0142(void); /*0x0143*/ bool ai0143(void); /*0x0144*/ bool ai0144(void); -/*0x0145*/ bool ai0145(void); +/*0x0145*/ bool aiRebuildTeams(void); /*0x0146*/ bool ai0146(void); /*0x0147*/ bool ai0147(void); /*0x0148*/ bool ai0148(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 50146b5e1..44970d938 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14278,7 +14278,7 @@ bool (*command_pointers[])(void) = { /*0x0142*/ ai0142, /*0x0143*/ ai0143, /*0x0144*/ ai0144, - /*0x0145*/ ai0145, + /*0x0145*/ aiRebuildTeams, /*0x0146*/ ai0146, /*0x0147*/ ai0147, /*0x0148*/ ai0148,