From 421ac0af794f59b89aaa583f2083fe9333be9a87 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Tue, 12 Nov 2024 13:18:02 +0100 Subject: [PATCH] port: 64-bit: fix extra fields in modelrodata_type11 --- port/src/preprocess/filemodel.c | 5 +++-- src/include/types.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/port/src/preprocess/filemodel.c b/port/src/preprocess/filemodel.c index 0d9ca077e..c2ff8c100 100644 --- a/port/src/preprocess/filemodel.c +++ b/port/src/preprocess/filemodel.c @@ -565,8 +565,9 @@ static u32 convertContent(u8 *dst, u8 *src, u32 src_file_len) dst_type11->unk08 = PD_BE32(src_type11->unk08); dst_type11->unk0c = PD_BE32(src_type11->unk0c); dst_type11->unk10 = PD_BE32(src_type11->unk10); - dst_type11->unk14 = (void *)(uintptr_t)PD_BE32(src_type11->extra1); - dst_type11->unk18 = PD_BE32(src_type11->extra2); + dst_type11->unk14 = NULL; + dst_type11->unk18 = PD_BE32(src_type11->extra1); + dst_type11->unk1c = PD_BE32(src_type11->extra2); dstpos += sizeof(*dst_type11); break; case CT_RODATA_TOGGLE: diff --git a/src/include/types.h b/src/include/types.h index 50d9df1a5..2936c93f9 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -539,6 +539,7 @@ struct modelrodata_type11 { // type 0x11 u32 unk10; void *unk14; u32 unk18; + u32 unk1c; }; struct modelrodata_toggle { // type 0x12