diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 39089cf17..95a0e060e 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -3337,22 +3337,12 @@ glabel func0f0aed3c /* f0aed6c: e448001c */ swc1 $f8,0x1c($v0) ); -GLOBAL_ASM( -glabel func0f0aed70 -/* f0aed70: 00047080 */ sll $t6,$a0,0x2 -/* f0aed74: c4a40000 */ lwc1 $f4,0x0($a1) -/* f0aed78: 01c47023 */ subu $t6,$t6,$a0 -/* f0aed7c: 3c0f800a */ lui $t7,%hi(var8009da60) -/* f0aed80: 25efda60 */ addiu $t7,$t7,%lo(var8009da60) -/* f0aed84: 000e7100 */ sll $t6,$t6,0x4 -/* f0aed88: 01cf1021 */ addu $v0,$t6,$t7 -/* f0aed8c: e4440020 */ swc1 $f4,0x20($v0) -/* f0aed90: c4a60004 */ lwc1 $f6,0x4($a1) -/* f0aed94: e4460024 */ swc1 $f6,0x24($v0) -/* f0aed98: c4a80008 */ lwc1 $f8,0x8($a1) -/* f0aed9c: 03e00008 */ jr $ra -/* f0aeda0: e4480028 */ swc1 $f8,0x28($v0) -); +void func0f0aed70(s32 index, struct coord *coord) +{ + var8009da60[index].unk20.x = coord->x; + var8009da60[index].unk20.y = coord->y; + var8009da60[index].unk20.z = coord->z; +} GLOBAL_ASM( glabel func0f0aeda4 diff --git a/src/include/game/game_0abe70.h b/src/include/game/game_0abe70.h index 0863a6da0..e78530358 100644 --- a/src/include/game/game_0abe70.h +++ b/src/include/game/game_0abe70.h @@ -5,7 +5,7 @@ u32 func0f0abe70(void); u32 func0f0ac138(void); -Gfx *func0f0ac4b8(Gfx *gdl, u32 arg1, f32 arg2, u32 *arg3, u32 colour1, f32 arg5, u32 *arg6, u32 colour2); +Gfx *func0f0ac4b8(Gfx *gdl, u32 arg1, f32 arg2, u32 *arg3, u32 colour1, f32 arg5, struct coord *arg6, u32 colour2); u32 func0f0acb90(void); void bullettailTick(struct bullettail *bullettail); u32 func0f0adcc8(void); @@ -15,7 +15,7 @@ u32 func0f0aebe0(void); u32 func0f0aec54(void); u32 func0f0aeca8(void); u32 func0f0aed3c(void); -u32 func0f0aed70(void); +void func0f0aed70(s32 index, struct coord *coord); u32 func0f0aeda4(void); void func0f0aeea8(s32 index, f32 arg1); Gfx *func0f0aeed8(Gfx *gdl); diff --git a/src/include/types.h b/src/include/types.h index ff2d12bf0..bd0a18d10 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6415,9 +6415,7 @@ struct var8009da60 { u32 unk14; u32 unk18; u32 unk1c; - u32 unk20; - u32 unk24; - u32 unk28; + struct coord unk20; f32 unk2c; };