diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 7daf33add..16eacaeea 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -311,23 +311,11 @@ glabel func0f157e94 /* f158104: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f158108 -/* f158108: 3c03800a */ lui $v1,%hi(var800a4cc4) -/* f15810c: 24634cc4 */ addiu $v1,$v1,%lo(var800a4cc4) -/* f158110: 8c6e0000 */ lw $t6,0x0($v1) -/* f158114: 00041080 */ sll $v0,$a0,0x2 -/* f158118: 00441021 */ addu $v0,$v0,$a0 -/* f15811c: 00021080 */ sll $v0,$v0,0x2 -/* f158120: 01c27821 */ addu $t7,$t6,$v0 -/* f158124: 91f80010 */ lbu $t8,0x10($t7) -/* f158128: a0b80000 */ sb $t8,0x0($a1) -/* f15812c: 8c790000 */ lw $t9,0x0($v1) -/* f158130: 03224021 */ addu $t0,$t9,$v0 -/* f158134: 91090011 */ lbu $t1,0x11($t0) -/* f158138: 03e00008 */ jr $ra -/* f15813c: a0c90000 */ sb $t1,0x0($a2) -); +void func0f158108(s32 index, u8 *arg1, u8 *arg2) +{ + *arg1 = var800a4cc4[index].unk10; + *arg2 = var800a4cc4[index].unk11; +} GLOBAL_ASM( glabel func0f158140 diff --git a/src/include/game/game_157db0.h b/src/include/game/game_157db0.h index 887857252..4d7163aea 100644 --- a/src/include/game/game_157db0.h +++ b/src/include/game/game_157db0.h @@ -5,7 +5,7 @@ u32 func0f157db0(void); void func0f157e94(s32 room, s32 arg1, struct screenbox *arg2); -u32 func0f158108(void); +void func0f158108(s32 index, u8 *arg1, u8 *arg2); u32 func0f158140(void); u32 func0f158184(void); u32 func0f158400(void); diff --git a/src/include/types.h b/src/include/types.h index fd137aed8..4fcaa9601 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6332,7 +6332,8 @@ struct var80062a8c { struct var800a4cc4 { u32 unk00; struct coord pos; - u32 unk10; + u8 unk10; + u8 unk11; }; struct healthdamagetype {