From 87db0220e78191217bc6a3c0e13054685b38c2c7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 16 Nov 2020 22:46:05 +1000 Subject: [PATCH] Attempt to decompile func0f11a434 --- src/game/pak/pak.c | 29 ++++++++++++++++++++++++++++- src/include/types.h | 6 +++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 0647ca4e2..38d7a4c45 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -294,7 +294,7 @@ void func0f116c2c(s8 index) u16 func0f116c54(s8 device) { - return var800a2380[device].unk262; + return var800a2380[device].unk260; } u32 func0f116c94(s8 device) @@ -4367,6 +4367,33 @@ glabel func0f11a434 /* f11a500: e44402b4 */ swc1 $f4,0x2b4($v0) ); +// Mismatch due to regalloc +//void func0f11a434(s8 device) +//{ +// var800a2380[device].unk274 = 3; +// var800a2380[device].unk014 = 0; +// var800a2380[device].unk000 = 0; +// var800a2380[device].unk008 = 1; +// var800a2380[device].unk004 = 1; +// var800a2380[device].unk00c = 3; +// var800a2380[device].unk010 = 0; +// var800a2380[device].unk29c = -1; +// var800a2380[device].unk2bd = 128; +// var800a2380[device].unk264 = 0; +// var800a2380[device].unk2b8_01 = 0; +// var800a2380[device].unk2b8_05 = 0; +// var800a2380[device].unk2b8_03 = 0; +// var800a2380[device].unk2b8_02 = 0; +// var800a2380[device].unk2b8_06 = 0; +// var800a2380[device].unk2b8_07 = 0; +// var800a2380[device].unk2c0 = NULL; +// var800a2380[device].unk2c4 = NULL; +// var800a2380[device].unk25c = 8; +// var800a2380[device].unk260 = 0; +// var800a2380[device].unk2c8 = 0; +// var800a2380[device].unk2b4 = -1; +//} + GLOBAL_ASM( glabel func0f11a504 /* f11a504: 27bdffd8 */ addiu $sp,$sp,-40 diff --git a/src/include/types.h b/src/include/types.h index 548d3a110..c488df000 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5118,8 +5118,7 @@ struct var800a2380 { /*0x014*/ u8 unk014; /*0x018*/ struct pakdata pakdata; /*0x25c*/ u32 unk25c; - /*0x260*/ u16 unk260; // uuid? - /*0x262*/ u16 unk262; + /*0x260*/ u32 unk260; /*0x264*/ u32 unk264; /*0x268*/ u32 unk268; /*0x26c*/ u32 unk26c; @@ -5134,7 +5133,7 @@ struct var800a2380 { /*0x290*/ u32 unk290; /*0x294*/ u32 unk294; /*0x298*/ u32 unk298; - /*0x29c*/ u32 unk29c; + /*0x29c*/ s32 unk29c; /*0x2a0*/ u32 unk2a0; /*0x2a4*/ u32 unk2a4; /*0x2a8*/ u32 unk2a8; @@ -5147,6 +5146,7 @@ struct var800a2380 { /*0x2b8*/ u8 unk2b8_04 : 1; /*0x2b8*/ u8 unk2b8_05 : 1; /*0x2b8*/ u8 unk2b8_06 : 1; + /*0x2b8*/ u8 unk2b8_07 : 1; /*0x2b9*/ u8 unk2b9; /*0x2ba*/ u8 unk2ba; /*0x2bb*/ u8 unk2bb;