From af33f7e05dbf72cceaee3451c96ad28beef3a73a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 20 Oct 2019 12:33:34 +1000 Subject: [PATCH] Decompile ai00f5 --- src/game/chr/chraicommands.c | 20 +++++++------------- src/include/setup/setup_0160b0.h | 1 + src/setup/setup_0160b0.c | 3 +-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 1937084d2..9b65f55c7 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -10194,19 +10194,13 @@ glabel ai00f4 /** * @cmd 00f5 */ -GLOBAL_ASM( -glabel ai00f5 -/* f0582f4: 3c03800a */ lui $v1,0x800a -/* f0582f8: 240e0001 */ addiu $t6,$zero,0x1 -/* f0582fc: 3c018007 */ lui $at,0x8007 -/* f058300: 24639fc0 */ addiu $v1,$v1,-24640 -/* f058304: ac2e073c */ sw $t6,0x73c($at) -/* f058308: 8c6f0438 */ lw $t7,0x438($v1) -/* f05830c: 00001025 */ or $v0,$zero,$zero -/* f058310: 25f80002 */ addiu $t8,$t7,0x2 -/* f058314: 03e00008 */ jr $ra -/* f058318: ac780438 */ sw $t8,0x438($v1) -); +bool ai00f5(void) +{ + g_8007073c = true; + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 00f6 diff --git a/src/include/setup/setup_0160b0.h b/src/include/setup/setup_0160b0.h index 930d190f6..c5850099b 100644 --- a/src/include/setup/setup_0160b0.h +++ b/src/include/setup/setup_0160b0.h @@ -5,6 +5,7 @@ extern struct menu_dialog menudialog_18d78; extern struct menu_dialog menudialog_18d90; +extern bool g_8007073c; extern u32 g_PlayersWithControl[]; extern bool g_PlayerInvincible; diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 7c2f378f8..2bf2baac7 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -435,7 +435,7 @@ u32 var0001674c = 0x00000001; u32 var00016750 = 0xffffffff; u32 var00016754 = 0xffffffff; u32 var00016758 = 0x00000000; -u32 var0001675c = 0x00000000; +bool g_8007073c = false; u32 var00016760 = 0x00000000; u32 var00016764 = 0x00000000; u32 var00016768 = 0x00000000; @@ -446,7 +446,6 @@ bool g_PlayersWithControl[] = { }; bool g_PlayerInvincible = false; - u32 var00016784 = 0x00000000; u32 var00016788 = 0x001a001c; u32 var0001678c = 0x00200021;