diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 952b4cc42..06dff539f 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -36684,25 +36684,14 @@ void func0f03e538(struct chrdata *chr, float arg1) } } -GLOBAL_ASM( -glabel func0f03e578 -/* f03e578: 27bdffe8 */ addiu $sp,$sp,-24 -/* f03e57c: afbf0014 */ sw $ra,0x14($sp) -/* f03e580: 8c8202d4 */ lw $v0,0x2d4($a0) -/* f03e584: 00802825 */ or $a1,$a0,$zero -/* f03e588: 10400003 */ beqz $v0,.L0f03e598 -/* f03e58c: 00000000 */ sll $zero,$zero,0x0 -/* f03e590: 10000003 */ beqz $zero,.L0f03e5a0 -/* f03e594: c44000a4 */ lwc1 $f0,0xa4($v0) -.L0f03e598: -/* f03e598: 0c006b91 */ jal func0001ae44 -/* f03e59c: 8ca40020 */ lw $a0,0x20($a1) -.L0f03e5a0: -/* f03e5a0: 8fbf0014 */ lw $ra,0x14($sp) -/* f03e5a4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f03e5a8: 03e00008 */ jr $ra -/* f03e5ac: 00000000 */ sll $zero,$zero,0x0 -); +float func0f03e578(struct chrdata *chr) +{ + if (chr->unk2d4) { + return chr->unk2d4->unka4; + } + + return func0001ae44(chr->unk020); +} GLOBAL_ASM( glabel func0f03e5b0 diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index 678f1d3ec..8b0d3f381 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -292,7 +292,7 @@ u32 func0f03e1a8(void); u32 func0f03e29c(void); float func0f03e45c(struct chrdata *chr); void func0f03e538(struct chrdata *chr, float arg1); -u32 func0f03e578(void); +float func0f03e578(struct chrdata *chr); u32 func0f03e5b0(void); u32 func0f03e5f0(void); u32 func0f03e754(void); diff --git a/src/include/library/library_1a500.h b/src/include/library/library_1a500.h index d8b24af11..890d68203 100644 --- a/src/include/library/library_1a500.h +++ b/src/include/library/library_1a500.h @@ -23,7 +23,7 @@ u32 func0001abc4(void); u32 func0001ad0c(void); u32 func0001ad34(void); u32 func0001ad5c(void); -u32 func0001ae44(void); +float func0001ae44(struct chr020 *chr020); void func0001ae90(struct chr020 *chr020, float arg1); u32 func0001af58(void); u32 func0001af64(void); diff --git a/src/include/types.h b/src/include/types.h index 9eee3cab3..d4569e388 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -191,7 +191,7 @@ struct chr2d4 { /*0x9c*/ u8 unk9c_06 : 1; /*0x9c*/ u8 unk9c_07 : 1; /*0xa0*/ u32 unka0; - /*0xa4*/ u32 unka4; + /*0xa4*/ float unka4; /*0xa8*/ u32 unka8; /*0xac*/ u32 unkac; /*0xb0*/ float unkb0;