diff --git a/src/game/game.c b/src/game/game.c index 132fd2ecb..7836d61eb 100644 --- a/src/game/game.c +++ b/src/game/game.c @@ -87839,24 +87839,12 @@ glabel func0f04db40 /** * @cmd 0000 */ -GLOBAL_ASM( -glabel ai0000 -/* f04dbc0: 3c03800a */ lui $v1,0x800a -/* f04dbc4: 24639fc0 */ addiu $v1,$v1,-24640 -/* f04dbc8: 8c640434 */ lw $a0,0x434($v1) -/* f04dbcc: 8c650438 */ lw $a1,0x438($v1) -/* f04dbd0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f04dbd4: afbf0014 */ sw $ra,0x14($sp) -/* f04dbd8: 00851021 */ addu $v0,$a0,$a1 -/* f04dbdc: 0fc13583 */ jal chraiGoToLabel -/* f04dbe0: 90460002 */ lbu $a2,0x2($v0) -/* f04dbe4: 8fbf0014 */ lw $ra,0x14($sp) -/* f04dbe8: 3c01800a */ lui $at,0x800a -/* f04dbec: ac22a3f8 */ sw $v0,-0x5c08($at) -/* f04dbf0: 00001025 */ or $v0,$zero,$zero -/* f04dbf4: 03e00008 */ jr $ra -/* f04dbf8: 27bd0018 */ addiu $sp,$sp,0x18 -); +bool aiGoToNext(void) +{ + u8 *buffer = g_Vars.ailist + g_Vars.aioffset; + g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, buffer[2]); + return false; +} /** * @cmd 0001 diff --git a/src/include/game.h b/src/include/game.h index d0b91a321..47e927c6b 100644 --- a/src/include/game.h +++ b/src/include/game.h @@ -3,7 +3,7 @@ #include #include "src/include/constants.h" -/*0x0000*/ bool ai0000(void); +/*0x0000*/ bool aiGoToNext(void); /*0x0001*/ bool aiGoToFirst(void); /*0x0002*/ bool aiLabel(void); /*0x0003*/ bool ai0003(void); diff --git a/src/setup.c b/src/setup.c index fd94af788..7d7e110e5 100644 --- a/src/setup.c +++ b/src/setup.c @@ -13947,7 +13947,7 @@ u32 var0000e4ac = 0x00000000; // e4b0 bool (*command_pointers[])(void) = { - /*0x0000*/ ai0000, + /*0x0000*/ aiGoToNext, /*0x0001*/ aiGoToFirst, /*0x0002*/ aiLabel, /*0x0003*/ ai0003,