From 37de186ff30f50d72e89e4c19ac4bc3e38f4c6c0 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 6 Oct 2019 23:22:17 +1000 Subject: [PATCH] Decompile aiSetDarkRoomList --- src/game/game.c | 35 +++++++++++++---------------------- src/include/game.h | 2 +- src/setup.c | 2 +- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/game/game.c b/src/game/game.c index d866cd0fe..08019b760 100644 --- a/src/game/game.c +++ b/src/game/game.c @@ -88084,28 +88084,19 @@ bool aiSetShootingAtMeList(void) /** * @cmd 01c3 */ -GLOBAL_ASM( -glabel ai01c3 -/* f04df64: 3c06800a */ lui $a2,0x800a -/* f04df68: 24c69fc0 */ addiu $a2,$a2,-24640 -/* f04df6c: 8cc30438 */ lw $v1,0x438($a2) -/* f04df70: 8cce0434 */ lw $t6,0x434($a2) -/* f04df74: 8cc50424 */ lw $a1,0x424($a2) -/* f04df78: 01c31021 */ addu $v0,$t6,$v1 -/* f04df7c: 904f0002 */ lbu $t7,0x2($v0) -/* f04df80: 90590003 */ lbu $t9,0x3($v0) -/* f04df84: 00001025 */ or $v0,$zero,$zero -/* f04df88: 000fc200 */ sll $t8,$t7,0x8 -/* f04df8c: 03192025 */ or $a0,$t8,$t9 -/* f04df90: 10a00003 */ beqz $a1,.L0f04dfa0 -/* f04df94: 3088ffff */ andi $t0,$a0,0xffff -/* f04df98: a4a8035a */ sh $t0,0x35a($a1) -/* f04df9c: 8cc30438 */ lw $v1,0x438($a2) -.L0f04dfa0: -/* f04dfa0: 24690004 */ addiu $t1,$v1,0x4 -/* f04dfa4: 03e00008 */ jr $ra -/* f04dfa8: acc90438 */ sw $t1,0x438($a2) -); +bool aiSetDarkRoomList(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + u16 ailistid = cmd[3] | (cmd[2] << 8); + + if (g_Vars.chrdata) { + g_Vars.chrdata->aidarkroomlist = ailistid; + } + + g_Vars.aioffset += 4; + + return false; +} /** * @cmd 01c4 diff --git a/src/include/game.h b/src/include/game.h index 7551778c4..31beccd9c 100644 --- a/src/include/game.h +++ b/src/include/game.h @@ -414,7 +414,7 @@ /*0x01c0*/ bool ai01c0(void); /*0x01c1*/ bool aiSetPunchDodgeList(void); /*0x01c2*/ bool aiSetShootingAtMeList(void); -/*0x01c3*/ bool ai01c3(void); +/*0x01c3*/ bool aiSetDarkRoomList(void); /*0x01c4*/ bool ai01c4(void); /*0x01c5*/ bool ai01c5(void); /*0x01c6*/ bool ai01c6(void); diff --git a/src/setup.c b/src/setup.c index 6af3b001b..75839d2b1 100644 --- a/src/setup.c +++ b/src/setup.c @@ -14398,7 +14398,7 @@ bool (*command_pointers[])(void) = { /*0x01c0*/ ai01c0, /*0x01c1*/ aiSetPunchDodgeList, /*0x01c2*/ aiSetShootingAtMeList, - /*0x01c3*/ ai01c3, + /*0x01c3*/ aiSetDarkRoomList, /*0x01c4*/ ai01c4, /*0x01c5*/ ai01c5, /*0x01c6*/ ai01c6,