diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 7fb0d8d7d..d7838720d 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -1792,37 +1792,17 @@ bool ai0043(void) /** * @cmd 0044 */ -GLOBAL_ASM( -glabel ai0044 -/* f050110: 27bdffe8 */ addiu $sp,$sp,-24 -/* f050114: 3c03800a */ lui $v1,0x800a -/* f050118: 24639fc0 */ addiu $v1,$v1,-24640 -/* f05011c: afbf0014 */ sw $ra,0x14($sp) -/* f050120: 0fc12293 */ jal func0f048a4c -/* f050124: 8c640424 */ lw $a0,0x424($v1) -/* f050128: 3c03800a */ lui $v1,0x800a -/* f05012c: 1040000a */ beqz $v0,.L0f050158 -/* f050130: 24639fc0 */ addiu $v1,$v1,-24640 -/* f050134: 8c640434 */ lw $a0,0x434($v1) -/* f050138: 8c650438 */ lw $a1,0x438($v1) -/* f05013c: 00851021 */ addu $v0,$a0,$a1 -/* f050140: 0fc13583 */ jal chraiGoToLabel -/* f050144: 90460002 */ lbu $a2,0x2($v0) -/* f050148: 3c03800a */ lui $v1,0x800a -/* f05014c: 24639fc0 */ addiu $v1,$v1,-24640 -/* f050150: 10000004 */ beqz $zero,.L0f050164 -/* f050154: ac620438 */ sw $v0,0x438($v1) -.L0f050158: -/* f050158: 8c6e0438 */ lw $t6,0x438($v1) -/* f05015c: 25cf0003 */ addiu $t7,$t6,0x3 -/* f050160: ac6f0438 */ sw $t7,0x438($v1) -.L0f050164: -/* f050164: 8fbf0014 */ lw $ra,0x14($sp) -/* f050168: 27bd0018 */ addiu $sp,$sp,0x18 -/* f05016c: 00001025 */ or $v0,$zero,$zero -/* f050170: 03e00008 */ jr $ra -/* f050174: 00000000 */ sll $zero,$zero,0x0 -); +bool aiIfShotAtCloseRange(void) +{ + if (func0f048a4c(g_Vars.chrdata)) { + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + } else { + g_Vars.aioffset += 3; + } + + return false; +} /** * @cmd 0045 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index fcf5b1fb7..815d1de51 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -71,7 +71,7 @@ /*0x0041*/ bool ai0041(void); /*0x0042*/ bool aiIfInLoadedRoom(void); /*0x0043*/ bool ai0043(void); -/*0x0044*/ bool ai0044(void); +/*0x0044*/ bool aiIfShotAtCloseRange(void); /*0x0045*/ bool ai0045(void); /*0x0046*/ bool ai0046(void); /*0x0047*/ bool ai0047(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index f00ac9a36..2fd5cff23 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14017,7 +14017,7 @@ bool (*command_pointers[])(void) = { /*0x0041*/ ai0041, /*0x0042*/ aiIfInLoadedRoom, /*0x0043*/ ai0043, - /*0x0044*/ ai0044, + /*0x0044*/ aiIfShotAtCloseRange, /*0x0045*/ ai0045, /*0x0046*/ ai0046, /*0x0047*/ ai0047,