From 151ae56f1164ddbae8f053f0d138ae4352917fe3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 28 Dec 2020 14:55:25 +1000 Subject: [PATCH] Decompile func0f02d3f8 --- src/game/data/data_0083d0.c | 2 +- src/game/game_02cde0.c | 14 ++++---------- src/include/game/data/data_0083d0.h | 1 + src/include/game/game_02cde0.h | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c index 0b1777112..63c314dc7 100644 --- a/src/game/data/data_0083d0.c +++ b/src/game/data/data_0083d0.c @@ -165,7 +165,7 @@ s32 var80062c6c[] = { 0x21, 0x20, 0x24, 0x2c, -1, }; -u32 var80062c80 = 0x00000000; +s32 var80062c80 = 0; u32 g_HeadsAIndex = 0x00000000; u32 g_HeadsBIndex = 0x00000000; u32 g_FemaleHeads[3] = {HEAD_ALEX, HEAD_JULIANNE, HEAD_LAURA}; diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index a8afd55ba..daf16427b 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -427,16 +427,10 @@ struct model *modelAllocateChr(u32 bodynum, u32 headnum, u32 flags) return func0f02d338(bodynum, headnum, 0, 0, a, b); } -GLOBAL_ASM( -glabel func0f02d3f8 -/* f02d3f8: 3c0e8006 */ lui $t6,%hi(var80062c80) -/* f02d3fc: 8dce2c80 */ lw $t6,%lo(var80062c80)($t6) -/* f02d400: 3c028006 */ lui $v0,%hi(var80062b1c) -/* f02d404: 000e7880 */ sll $t7,$t6,0x2 -/* f02d408: 004f1021 */ addu $v0,$v0,$t7 -/* f02d40c: 03e00008 */ jr $ra -/* f02d410: 8c422b1c */ lw $v0,%lo(var80062b1c)($v0) -); +s32 func0f02d3f8(void) +{ + return var80062b1c[var80062c80]; +} u32 bodyGetHead(u32 bodynum) { diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h index 2b14edb7f..05eff41e0 100644 --- a/src/include/game/data/data_0083d0.h +++ b/src/include/game/data/data_0083d0.h @@ -120,6 +120,7 @@ extern s32 var80062b68[]; extern s32 var80062c14[]; extern s32 var80062c58[]; extern s32 var80062c6c[]; +extern s32 var80062c80; extern u32 g_HeadsAIndex; extern u32 g_HeadsBIndex; extern u32 g_FemaleHeads[3]; diff --git a/src/include/game/game_02cde0.h b/src/include/game/game_02cde0.h index 98d344b14..34ac37d3c 100644 --- a/src/include/game/game_02cde0.h +++ b/src/include/game/game_02cde0.h @@ -8,7 +8,7 @@ bool bodyLoad(u32 bodynum); u32 func0f02ce8c(void); struct model *func0f02d338(u32 bodynum, u32 headnum, u32 arg2, u32 arg3, bool arg4, u32 arg5); struct model *modelAllocateChr(u32 bodynum, u32 headnum, u32 flags); -u32 func0f02d3f8(void); +s32 func0f02d3f8(void); u32 bodyGetHead(u32 bodynum); void chrUnpack(s32 stagenum, void *cmddata, s32 cmdindex); struct prop *propAllocateEyespy(struct pad *pad, s16 room);