From d0ae05098bcd487b6e9d954a54dc72e42f787e56 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 14 Apr 2020 20:00:23 +1000 Subject: [PATCH] Decompile func0f0246e4 --- src/game/chr/chr.c | 18 ++++++++---------- src/game/data/data_0083d0.c | 2 +- src/include/game/chr/chr.h | 2 +- src/include/game/data/data_0083d0.h | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 42f6e3a33..331c6b451 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -6895,17 +6895,15 @@ glabel func0f024668 /* f0246e0: 27bd0020 */ addiu $sp,$sp,0x20 ); +void func0f0246e4(u8 *arg0) +{ + var80062a48[0] = arg0[0]; + var80062a48[1] = arg0[1]; + var80062a48[2] = arg0[2]; +} + GLOBAL_ASM( -glabel func0f0246e4 -/* f0246e4: 908e0000 */ lbu $t6,0x0($a0) -/* f0246e8: 3c028006 */ lui $v0,%hi(var80062a48) -/* f0246ec: 24422a48 */ addiu $v0,$v0,%lo(var80062a48) -/* f0246f0: a04e0000 */ sb $t6,0x0($v0) -/* f0246f4: 908f0001 */ lbu $t7,0x1($a0) -/* f0246f8: a04f0001 */ sb $t7,0x1($v0) -/* f0246fc: 90980002 */ lbu $t8,0x2($a0) -/* f024700: 03e00008 */ jr $ra -/* f024704: a0580002 */ sb $t8,0x2($v0) +glabel func0f024708 /* f024708: 3c028006 */ lui $v0,%hi(var80062a48) /* f02470c: 24422a48 */ addiu $v0,$v0,%lo(var80062a48) /* f024710: 904e0000 */ lbu $t6,0x0($v0) diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c index 9088bb9fc..39f26f99c 100644 --- a/src/game/data/data_0083d0.c +++ b/src/game/data/data_0083d0.c @@ -436,7 +436,7 @@ u32 var80062a38 = 0x00000000; u32 var80062a3c = 0x00000000; u32 var80062a40 = 0x00000000; u32 var80062a44 = 0x00000000; -u32 var80062a48 = 0x400a0a00; +u8 var80062a48[] = { 64, 10, 10 }; u32 var80062a4c = 0x00000000; u32 var80062a50 = 0x00000001; u32 var80062a54 = 0x00000003; diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index 3dc9e08dd..f6c35c017 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -28,7 +28,7 @@ u32 func0f023098(void); void chrDropItems(struct chrdata *chr); u32 chrSetHudpieceVisible(struct chrdata *chr, u32 arg1); void func0f024668(struct chrdata *chr); -u32 func0f0246e4(void); +void func0f0246e4(u8 *arg0); u32 func0f024738(void); u32 func0f024b18(void); u32 func0f025074(void); diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h index 1d816aaf3..c104c447d 100644 --- a/src/include/game/data/data_0083d0.h +++ b/src/include/game/data/data_0083d0.h @@ -98,7 +98,7 @@ extern u32 var80062998; extern u32 var800629d8; extern u32 var800629fc; extern u32 var80062a3c; -extern u32 var80062a48; +extern u8 var80062a48[]; extern u32 var80062a4c; extern u32 var80062a8c; extern u32 var80062a90;