diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 6da12eadf..952b4cc42 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -36675,27 +36675,14 @@ glabel func0f03e45c /* f03e534: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f03e538 -/* f03e538: 27bdffe8 */ addiu $sp,$sp,-24 -/* f03e53c: afbf0014 */ sw $ra,0x14($sp) -/* f03e540: 8c8202d4 */ lw $v0,0x2d4($a0) -/* f03e544: 44856000 */ mtc1 $a1,$f12 -/* f03e548: 00803025 */ or $a2,$a0,$zero -/* f03e54c: 50400004 */ beqzl $v0,.L0f03e560 -/* f03e550: 44056000 */ mfc1 $a1,$f12 -/* f03e554: 10000004 */ beqz $zero,.L0f03e568 -/* f03e558: e44c00b0 */ swc1 $f12,0xb0($v0) -/* f03e55c: 44056000 */ mfc1 $a1,$f12 -.L0f03e560: -/* f03e560: 0c006ba4 */ jal func0001ae90 -/* f03e564: 8cc40020 */ lw $a0,0x20($a2) -.L0f03e568: -/* f03e568: 8fbf0014 */ lw $ra,0x14($sp) -/* f03e56c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f03e570: 03e00008 */ jr $ra -/* f03e574: 00000000 */ sll $zero,$zero,0x0 -); +void func0f03e538(struct chrdata *chr, float arg1) +{ + if (chr->unk2d4) { + chr->unk2d4->unkb0 = arg1; + } else { + func0001ae90(chr->unk020, arg1); + } +} GLOBAL_ASM( glabel func0f03e578 diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index f3a97b092..678f1d3ec 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -291,7 +291,7 @@ u32 func0f03e0e4(void); u32 func0f03e1a8(void); u32 func0f03e29c(void); float func0f03e45c(struct chrdata *chr); -u32 func0f03e538(void); +void func0f03e538(struct chrdata *chr, float arg1); u32 func0f03e578(void); u32 func0f03e5b0(void); u32 func0f03e5f0(void); diff --git a/src/include/library/library_1a500.h b/src/include/library/library_1a500.h index 96d09f877..d8b24af11 100644 --- a/src/include/library/library_1a500.h +++ b/src/include/library/library_1a500.h @@ -24,7 +24,7 @@ u32 func0001ad0c(void); u32 func0001ad34(void); u32 func0001ad5c(void); u32 func0001ae44(void); -u32 func0001ae90(void); +void func0001ae90(struct chr020 *chr020, float arg1); u32 func0001af58(void); u32 func0001af64(void); u32 func0001af80(void); diff --git a/src/include/types.h b/src/include/types.h index 43fe19b25..9eee3cab3 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -190,6 +190,11 @@ struct chr2d4 { /*0x9c*/ u8 unk9c_05 : 1; /*0x9c*/ u8 unk9c_06 : 1; /*0x9c*/ u8 unk9c_07 : 1; + /*0xa0*/ u32 unka0; + /*0xa4*/ u32 unka4; + /*0xa8*/ u32 unka8; + /*0xac*/ u32 unkac; + /*0xb0*/ float unkb0; }; struct act_stand {