diff --git a/librecomp/src/pak.cpp b/librecomp/src/pak.cpp index f8d42c3..eac5192 100644 --- a/librecomp/src/pak.cpp +++ b/librecomp/src/pak.cpp @@ -49,7 +49,7 @@ extern "C" void osPfsAllocateFile_recomp(uint8_t* rdram, recomp_context* ctx) { u32 game_code = _arg<2, u32>(rdram, ctx); PTR(u8) game_name = _arg<3, PTR(u8)>(rdram, ctx); PTR(u8) ext_name = _arg<4, PTR(u8)>(rdram, ctx); - int file_size = _arg<5, int>(rdram, ctx); + int nbytes = _arg<5, int>(rdram, ctx); PTR(s32) file_no = _arg<6, PTR(s32)>(rdram, ctx); u8 game_name_proxy[PFS_FILE_NAME_LEN]; u8 ext_name_proxy[PFS_FILE_EXT_LEN]; @@ -60,7 +60,7 @@ extern "C" void osPfsAllocateFile_recomp(uint8_t* rdram, recomp_context* ctx) { for (uint32_t i = 0; i < PFS_FILE_EXT_LEN; i++) { ext_name_proxy[i] = MEM_B(i, ext_name); } - s32 ret = osPfsAllocateFile(PASS_RDRAM pfs, company_code, game_code, game_name_proxy, ext_name_proxy, file_size, file_no); + s32 ret = osPfsAllocateFile(PASS_RDRAM pfs, company_code, game_code, game_name_proxy, ext_name_proxy, nbytes, file_no); _return(ctx, ret); } diff --git a/ultramodern/include/ultramodern/ultra64.h b/ultramodern/include/ultramodern/ultra64.h index 8c743e7..7cb288d 100644 --- a/ultramodern/include/ultramodern/ultra64.h +++ b/ultramodern/include/ultramodern/ultra64.h @@ -340,10 +340,10 @@ s32 osPfsRepairId(RDRAM_ARG PTR(OSPfs) pfs); s32 osPfsInit(RDRAM_ARG PTR(OSMesgQueue) queue, PTR(OSPfs) pfs, int channel); s32 osPfsReFormat(RDRAM_ARG PTR(OSPfs) pfs, PTR(OSMesgQueue) queue, int channel); s32 osPfsChecker(RDRAM_ARG PTR(OSPfs) pfs); -s32 osPfsAllocateFile(RDRAM_ARG PTR(OSPfs) pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, int file_size_in_bytes, PTR(s32) file_no); +s32 osPfsAllocateFile(RDRAM_ARG PTR(OSPfs) pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, int nbytes, PTR(s32) file_no); s32 osPfsFindFile(RDRAM_ARG PTR(OSPfs) pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, PTR(s32) file_no); s32 osPfsDeleteFile(RDRAM_ARG PTR(OSPfs) pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name); -s32 osPfsReadWriteFile(RDRAM_ARG PTR(OSPfs) pfs, s32 file_no, u8 flag, int offset, int size_in_bytes, u8* data_buffer); +s32 osPfsReadWriteFile(RDRAM_ARG PTR(OSPfs) pfs, s32 file_no, u8 flag, int offset, int nbytes, u8* data_buffer); s32 osPfsFileState(RDRAM_ARG PTR(OSPfs) pfs, s32 file_no, PTR(OSPfsState) state); s32 osPfsGetLabel(RDRAM_ARG PTR(OSPfs) pfs, u8* label, PTR(int) len); s32 osPfsSetLabel(RDRAM_ARG PTR(OSPfs) pfs, u8* label);