diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 764ee69d9..178e3b006 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -8233,21 +8233,16 @@ glabel func0f15015c /* f1507b0: 27bd14f8 */ addiu $sp,$sp,0x14f8 ); +void func0f1507b4(s32 index, struct fileguid *guid) +{ + u8 *ptr = func0f14a06c(index); + + guid->fileid = *(s32 *) &ptr[0x3f8]; + guid->deviceserial = *(u16 *) &ptr[0x3fc]; +} + GLOBAL_ASM( -glabel func0f1507b4 -/* f1507b4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1507b8: afbf0014 */ sw $ra,0x14($sp) -/* f1507bc: 0fc5281b */ jal func0f14a06c -/* f1507c0: afa5001c */ sw $a1,0x1c($sp) -/* f1507c4: 8fa3001c */ lw $v1,0x1c($sp) -/* f1507c8: 8c4e03f8 */ lw $t6,0x3f8($v0) -/* f1507cc: ac6e0000 */ sw $t6,0x0($v1) -/* f1507d0: 944f03fc */ lhu $t7,0x3fc($v0) -/* f1507d4: a46f0004 */ sh $t7,0x4($v1) -/* f1507d8: 8fbf0014 */ lw $ra,0x14($sp) -/* f1507dc: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1507e0: 03e00008 */ jr $ra -/* f1507e4: 00000000 */ nop +glabel func0f1507e8 /* f1507e8: 27bdffe8 */ addiu $sp,$sp,-24 /* f1507ec: afbf0014 */ sw $ra,0x14($sp) /* f1507f0: afa40018 */ sw $a0,0x18($sp) diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index a6c5313be..8d64c9a76 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -8,7 +8,7 @@ u32 func0f149c90(void); u32 func0f149d58(void); u32 func0f149e58(void); u32 func0f14a00c(void); -u32 func0f14a06c(void); +void *func0f14a06c(s32 index); u32 func0f14a16c(void); u32 func0f14a1cc(void); u32 func0f14a1ec(void); @@ -86,7 +86,7 @@ u32 func0f14fdb0(void); u32 func0f14ff94(void); u32 func0f150068(void); s32 func0f15015c(s32 device, s32 filenum, u8 *arg2); -void func0f1507b4(s32 arg0, struct fileguid *guid); +void func0f1507b4(s32 index, struct fileguid *guid); extern const char var7f1b6050[]; extern const char var7f1b6058[];